Commits

Ivan Vershigora  committed 0cb2615 Merge

merge

  • Participants
  • Parent commits efc5c25, 54a4886

Comments (0)

Files changed (3)

 Django user registration
 ========================
 
-This is a fairly simple user-registration application for Django,
-designed to make allowing user signups as painless as possible. It
-requires a functional installation of Django 1.3 or newer, but has no
-other dependencies.
-
-For installation instructions, see the file "INSTALL" in this
-directory; for instructions on how to use this application, and on
-what it provides, see the file "quickstart.rst" in the "docs/"
-directory.
+This is an experimental branch of django-registration, rewriting the
+application to use Django's class-based views. If you know what you're
+doing, feel free to use it; otherwise, please stick with the latest
+mainline released version (0.8).

File registration/backends/default/urls.py

 
 
 from django.conf.urls.defaults import *
-from django.views.generic.simple import direct_to_template
 
 from registration.views import activate
 from registration.views import register
 
+def template_view(template_name):
+    try:
+        from django.views.generic.simple import direct_to_template
+        def curried_template_view(request, extra_context=None, mimetype=None, **kwargs):
+            return direct_to_template(request, template_name, extra_context,
+                mimetype, **kwargs)
+        return curried_template_view
+    except ImportError:
+        from django.views.generic import TemplateView
+        return TemplateView.as_view(template_name=template_name)
 
 urlpatterns = patterns('',
                        url(r'^activate/complete/$',
-                           direct_to_template,
-                           {'template': 'registration/activation_complete.html'},
+                           template_view('registration/activation_complete.html'),
                            name='registration_activation_complete'),
                        # Activation keys get matched by \w+ instead of the more specific
                        # [a-fA-F0-9]{40} because a bad activation key should still get to the view;
                            {'backend': 'registration.backends.default.DefaultBackend'},
                            name='registration_register'),
                        url(r'^register/complete/$',
-                           direct_to_template,
-                           {'template': 'registration/registration_complete.html'},
+                           template_view('registration/registration_complete.html'),
                            name='registration_complete'),
                        url(r'^register/closed/$',
-                           direct_to_template,
-                           {'template': 'registration/registration_closed.html'},
+                           template_view('registration/registration_closed.html'),
                            name='registration_disallowed'),
                        (r'', include('registration.auth_urls')),
                        )

File registration/models.py

File contents unchanged.