Replace django.conf.urls.defaults by django.conf.urls

See <https://docs.djangoproject.com/en/1.5/ref/urls/>

6 files changed, 12 insertions, 12 deletions

diff --git a/askbot/deps/django_authopenid/urls.py b/askbot/deps/django_authopenid/urls.py
index 5103dce6..d1a4a1fa 100644
--- a/askbot/deps/django_authopenid/urls.py
+++ b/askbot/deps/django_authopenid/urls.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.conf import settings as django_settings
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 if django_settings.ASKBOT_TRANSLATE_URL == True:
     from django.utils.translation import ugettext as _
diff --git a/askbot/deps/group_messaging/urls.py b/askbot/deps/group_messaging/urls.py
index 19ee35bb..2dba861d 100644
--- a/askbot/deps/group_messaging/urls.py
+++ b/askbot/deps/group_messaging/urls.py
@@ -1,6 +1,6 @@
 """url configuration for the group_messaging application"""
-from django.conf.urls.defaults import patterns
-from django.conf.urls.defaults import url
+from django.conf.urls import patterns
+from django.conf.urls import url
 from group_messaging import views
 
 urlpatterns = patterns('',
diff --git a/askbot/deps/livesettings/urls.py b/askbot/deps/livesettings/urls.py
index b608bf1f..2c1ecaa7 100644
--- a/askbot/deps/livesettings/urls.py
+++ b/askbot/deps/livesettings/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('askbot.deps.livesettings.views',
     url(r'^$', 'site_settings', {}, name='site_settings'),
diff --git a/askbot/setup_templates/urls.py b/askbot/setup_templates/urls.py
index 21338a0a..47826c8e 100644
--- a/askbot/setup_templates/urls.py
+++ b/askbot/setup_templates/urls.py
@@ -2,11 +2,11 @@
 main url configuration file for the askbot site
 """
 from django.conf import settings
-from django.conf.urls.defaults import handler404
-from django.conf.urls.defaults import handler500
-from django.conf.urls.defaults import include
-from django.conf.urls.defaults import patterns
-from django.conf.urls.defaults import url
+from django.conf.urls import handler404
+from django.conf.urls import handler500
+from django.conf.urls import include
+from django.conf.urls import patterns
+from django.conf.urls import url
 from django.conf import settings
 from django.contrib import admin
 
diff --git a/askbot/urls.py b/askbot/urls.py
index 618562e7..e32cfaa4 100644
--- a/askbot/urls.py
+++ b/askbot/urls.py
@@ -4,8 +4,8 @@ askbot askbot url configuraion file
 import os.path
 import django
 from django.conf import settings
-from django.conf.urls.defaults import url, patterns, include
-from django.conf.urls.defaults import handler500, handler404
+from django.conf.urls import url, patterns, include
+from django.conf.urls import handler500, handler404
 from django.contrib import admin
 from askbot import views
 from askbot.feed import RssLastestQuestionsFeed, RssIndividualQuestionFeed
diff --git a/askbot/utils/url_utils.py b/askbot/utils/url_utils.py
index 3c4fa7b5..d5ea953c 100644
--- a/askbot/utils/url_utils.py
+++ b/askbot/utils/url_utils.py
@@ -2,7 +2,7 @@ import os
 import urlparse
 from django.core.urlresolvers import reverse
 from django.conf import settings
-from django.conf.urls.defaults import url
+from django.conf.urls import url
 
 def service_url(*args, **kwargs):
     """adds the service prefix to the url"""