Commits

James Reynolds committed c831654 Draft Merge

Merged in lemuelf/django-registration/django_1.5_urls_defaults_deprecation_fix (pull request #4)

Fix more django.conf.urls.defaults DeprecationWarning; keep Django 1.3 compatibility.

Comments (0)

Files changed (4)

registration/auth_urls.py

 
 """
 
-from django.conf.urls.defaults import *
-
+try:
+    from django.conf.urls import patterns, url
+except ImportError:
+    from django.conf.urls.defaults import *
 from django.contrib.auth import views as auth_views
 
 

registration/backends/default/urls.py

 
 """
 
-
-from django.conf.urls import *
+try:
+    from django.conf.urls import patterns, url, include
+except ImportError:
+    from django.conf.urls.defaults import *
 from django.views.generic import TemplateView
 
 from registration.views import activate

registration/backends/simple/urls.py

 
 """
 
-
-from django.conf.urls import *
+try:
+    from django.conf.urls import patterns, url, include
+except ImportError:
+    from django.conf.urls.defaults import *
 from django.views.generic import TemplateView
 
 

registration/tests/urls.py

 
 """
 
-from django.conf.urls.defaults import *
+try:
+    from django.conf.urls import patterns, url, include
+except ImportError:
+    from django.conf.urls.defaults import *
 from django.views.generic import TemplateView
 
 from registration.views import activate