summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2011-10-29 12:24:44 +0000
committerRamiro Morales <cramm0@gmail.com>2011-10-29 12:24:44 +0000
commit24f3c06e4aaee3370098d454dab61c175ccf8319 (patch)
tree44ca00004d91bf146d89785b72e569b50171f901
parent3e66913f967e01295d86a86b981e3f54fbda29a5 (diff)
More django.conf.urls.defaults removals. Refs #17132
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/urlresolvers.py2
-rw-r--r--tests/regressiontests/admin_custom_urls/models.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
index c04345600c..a2533198b3 100644
--- a/django/core/urlresolvers.py
+++ b/django/core/urlresolvers.py
@@ -336,7 +336,7 @@ class RegexURLResolver(LocaleRegexProvider):
callback = getattr(self.urlconf_module, 'handler%s' % view_type, None)
if not callback:
# No handler specified in file; use default
- # Lazy import, since urls.defaults imports this file
+ # Lazy import, since django.urls imports this file
from django.conf import urls
callback = getattr(urls, 'handler%s' % view_type)
return get_callable(callback), {}
diff --git a/tests/regressiontests/admin_custom_urls/models.py b/tests/regressiontests/admin_custom_urls/models.py
index f8c83a9024..facb4b52e7 100644
--- a/tests/regressiontests/admin_custom_urls/models.py
+++ b/tests/regressiontests/admin_custom_urls/models.py
@@ -31,7 +31,7 @@ class ActionAdmin(admin.ModelAdmin):
def get_urls(self):
# Add the URL of our custom 'add_view' view to the front of the URLs
# list. Remove the existing one(s) first
- from django.conf.urls.defaults import patterns, url
+ from django.conf.urls import patterns, url
def wrap(view):
def wrapper(*args, **kwargs):