All occurences of 'django.conf.urls.defaults' have been replaced by 'django.conf.urls'.

see #384

modoboa/admin/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns(
     'modoboa.admin.views',
@@ -42,4 +42,4 @@ urlpatterns = patterns(
     (r'^aliases/new/$', 'newalias'),
     (r'^aliases/edit/(?P<alid>\d+)/$', 'editalias_dispatcher'),
     (r'^aliases/delete/$', 'delalias'),
-    )
+)

modoboa/demo/urls.py

@@ -1,5 +1,5 @@
 # coding: utf-8
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns('modoboa.demo.views',
     (r'^sendvirus/$', 'send_virus'),

modoboa/extensions/amavis/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns(
     'modoboa.extensions.amavis.views',

modoboa/extensions/limits/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns(
     'modoboa.extensions.limits.views',

modoboa/extensions/sievefilters/urls.py

@@ -1,21 +1,21 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns('modoboa.extensions.sievefilters.views',
-                       (r'^$', 'index'),
-                       (r'^savefs/(?P<name>.+)/$', 'savefs'),
-                       (r'^newfs/$', 'new_filters_set'),
-                       (r'^removefs/(?P<name>.+)/$', 'remove_filters_set'),
-                       (r'^activatefs/(?P<name>.+)/$', 'activate_filters_set'),
-                       (r'^downloadfs/(?P<name>.+)/$', 'download_filters_set'),
-                       (r'^templates/(?P<ftype>\w+)/$', 'get_templates'),
-                       (r'^(?P<setname>.+)/newfilter/$', 'newfilter'),
-                       (r'^(?P<setname>.+)/editfilter/(?P<fname>.+)/$', 'editfilter'),
-                       (r'^(?P<setname>.+)/removefilter/(?P<fname>.+)/$', 'removefilter'),
-                       (r'^(?P<setname>.+)/togglestate/(?P<fname>.+)/$', 
-                        'toggle_filter_state'),
-                       (r'^(?P<setname>.+)/moveup/(?P<fname>.+)/$', 
-                        'move_filter_up'),
-                       (r'^(?P<setname>.+)/movedown/(?P<fname>.+)/$', 
-                        'move_filter_down'),
-                       (r'^(?P<name>.+)/$', 'getfs'),
-                       )
+    (r'^$', 'index'),
+    (r'^savefs/(?P<name>.+)/$', 'savefs'),
+    (r'^newfs/$', 'new_filters_set'),
+    (r'^removefs/(?P<name>.+)/$', 'remove_filters_set'),
+    (r'^activatefs/(?P<name>.+)/$', 'activate_filters_set'),
+    (r'^downloadfs/(?P<name>.+)/$', 'download_filters_set'),
+    (r'^templates/(?P<ftype>\w+)/$', 'get_templates'),
+    (r'^(?P<setname>.+)/newfilter/$', 'newfilter'),
+    (r'^(?P<setname>.+)/editfilter/(?P<fname>.+)/$', 'editfilter'),
+    (r'^(?P<setname>.+)/removefilter/(?P<fname>.+)/$', 'removefilter'),
+    (r'^(?P<setname>.+)/togglestate/(?P<fname>.+)/$', 
+     'toggle_filter_state'),
+    (r'^(?P<setname>.+)/moveup/(?P<fname>.+)/$', 
+     'move_filter_up'),
+    (r'^(?P<setname>.+)/movedown/(?P<fname>.+)/$', 
+     'move_filter_down'),
+    (r'^(?P<name>.+)/$', 'getfs'),
+)

modoboa/extensions/stats/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, include, url
 
 urlpatterns = patterns('modoboa.extensions.stats.views',
                        url(r'^$', 'index', name='fullindex'),

modoboa/extensions/webmail/urls.py

@@ -1,5 +1,5 @@
 # coding: utf-8
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns(
     'modoboa.extensions.webmail.views',

modoboa/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, include, url
 from django.conf import settings
 from modoboa.extensions import *
 from modoboa.lib import parameters

modoboa/userprefs/urls.py

@@ -1,13 +1,14 @@
 # coding: utf-8
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from modoboa.lib import events
 
 urlpatterns = patterns('modoboa.userprefs.views',
-                       url(r'^$', 'index'),
-                       (r'^preferences/$', 'preferences'),
-                       (r'^profile/$', 'profile'),
-                       (r'^forward/$', 'forward'),
-                       )
+    url(r'^$', 'index'),
+    (r'^preferences/$', 'preferences'),
+    (r'^profile/$', 'profile'),
+    (r'^forward/$', 'forward'),
+)
 
 urlpatterns += patterns('',
-                        *events.raiseQueryEvent("ExtraUprefsRoutes"))
+    *events.raiseQueryEvent("ExtraUprefsRoutes")
+)