Anpassungen des Codes an Django 1.11 mit Python 3

Grapelli wurde entfernt, das neue Django Admin ist hübsch genug.

src/membership/models.py

@@ -96,7 +96,7 @@ class ActivationRequest(models.Model):
         verbose_name = _('pending activation')
         verbose_name_plural = _('pending activations')
 
-    def __unicode__(self):
+    def __str__(self):
         return _("user registration for %s") % self.user
 
     def activate(self):
@@ -215,7 +215,7 @@ class Membership(AbstractUser):
         verbose_name = _('Membership')
         verbose_name_plural = _('Memberships')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.username
 
     def get_absolute_url(self):

src/membership/templates/membership/register_form.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load i18n fieldset_extras %}
-{% load url from future %}
 
 {% block title %}{% trans "Registration"%}{% endblock %}
 {% block teaser%}

src/membership/templates/membership/register_successful.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load url from future %}
+
 
 {% block title %}{% trans "Activation sent"%}{% endblock %}
 

src/membership/templates/registration/login.html

@@ -1,17 +1,16 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block title %}{% trans 'Login' %}{% endblock %}
 {% block description %}Anmelden auf Kasu.at{% endblock %}
 
 {% block extra_head %}
-<link rel="canonical" href="{% url 'django.contrib.auth.views.login' %}"/>
+<link rel="canonical" href="{% url 'login' %}"/>
 {% endblock %}
 
 {% block teaser %}<h1>{% trans 'Login' %}</h1>{% endblock %}
 {% block maincontent %}
-<form method="post" action="{% url 'django.contrib.auth.views.login' %}">
+<form method="post" action="{% url 'login' %}">
   <h2 class="grid_12">Auf der Seite Anmelden</h2>
 
   <div class="grid_7">

src/membership/urls.py

@@ -3,26 +3,38 @@ Created on 03.10.2011
 
 @author: christian
 """
-from django.conf.urls import *  # @UnusedWildImport
+import django.contrib.auth.views as auth_views
+from django.conf.urls import url, include
 
 from . import views
 
-
-urlpatterns = patterns(
-    '',
-    url('', include('social_django.urls', namespace='social')),
-    url('', include('django.contrib.auth.urls')),
-    url(r'^register/$',
-        views.RegisterForm.as_view(),
-        name="membership-register"),
+urlpatterns = [
     url(r'^activate/(?P<activation_key>[\d\w]+)/$',
         views.ActivateRegistration.as_view(),
         name='membership-activate-registration'),
     url(r'^activation_sent/$',
         views.ActivationSent.as_view(),
         name="membership-registration-complete"),
+    url(r'^login/$', auth_views.LoginView.as_view(), name='login'),
+    url(r'^logout/$', auth_views.LogoutView.as_view(), name='logout'),
+    url(r'^password_change/$', auth_views.PasswordChangeView.as_view(),
+        name='password_change'),
+    url(r'^password_change/done/$', auth_views.PasswordChangeDoneView.as_view(),
+        name='password_change_done'),
+    url(r'^password_reset/$', auth_views.PasswordResetView.as_view(),
+        name='password_reset'),
+    url(r'^password_reset/done/$', auth_views.PasswordResetDoneView.as_view(),
+        name='password_reset_done'),
+    url(r'^register/$', views.RegisterForm.as_view(),
+        name="membership-register"),
+    url(
+        r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
+        auth_views.PasswordResetConfirmView.as_view(),
+        name='password_reset_confirm'),
+    url(r'^reset/done/$', auth_views.PasswordResetCompleteView.as_view(),
+        name='password_reset_complete'),
     url(r'^(?P<username>[\-\.\d\w]+)/$',
         views.MembershipDetail.as_view(), name='membership-details'),
     url(r'^(?P<username>[\-\.\d\w]+)/edit/$',
         views.EditMembership.as_view(), name="membership-edit")
-)
+]