James Reynolds avatar 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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.