django.contrib.urls.defaults -> django.contrib.urls

Author: Rebecca Lovewell

pycon/profile/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 
 urlpatterns = patterns("pycon.profile.views",

pycon/schedule/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 
 urlpatterns = patterns("pycon.schedule.views",

pycon/tutorials/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 from .views import tutorial_email, tutorial_message
 

symposion/boxes/urls.py

@@ -1,6 +1,6 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 
 urlpatterns = patterns("symposion.boxes.views",
     url(r"^([-\w]+)/edit/$", "box_edit", name="box_edit"),
-)
+)

symposion/cms/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 PAGE_RE = r"(([\w-]{1,})(/[\w-]{1,})*)/"
 

symposion/conference/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 
 urlpatterns = patterns("symposion.conference.views",

symposion/reviews/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns("symposion.reviews.views",
@@ -12,9 +12,9 @@
     url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/$", "result_notification", name="result_notification"),
     url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/prepare/$", "result_notification_prepare", name="result_notification_prepare"),
     url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/send/$", "result_notification_send", name="result_notification_send"),
-    
+
     url(r"^review/(?P<pk>\d+)/$", "review_detail", name="review_detail"),
-    
+
     url(r"^(?P<pk>\d+)/delete/$", "review_delete", name="review_delete"),
     url(r"^assignments/$", "review_assignments", name="review_assignments"),
     url(r"^assignment/(?P<pk>\d+)/opt-out/$", "review_assignment_opt_out", name="review_assignment_opt_out"),

symposion/schedule/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 
 urlpatterns = patterns("symposion.schedule.views",

symposion/speakers/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 
 urlpatterns = patterns("symposion.speakers.views",

symposion/teams/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 
 urlpatterns = patterns("symposion.teams.views",
@@ -7,7 +7,7 @@
     url(r"^(?P<slug>[\w\-]+)/join/$", "team_join", name="team_join"),
     url(r"^(?P<slug>[\w\-]+)/leave/$", "team_leave", name="team_leave"),
     url(r"^(?P<slug>[\w\-]+)/apply/$", "team_apply", name="team_apply"),
-    
+
     # membership specific
     url(r"^promote/(?P<pk>\d+)/$", "team_promote", name="team_promote"),
     url(r"^demote/(?P<pk>\d+)/$", "team_demote", name="team_demote"),