summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2011-10-28 21:23:50 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2011-10-28 21:23:50 +0000
commit3e66913f967e01295d86a86b981e3f54fbda29a5 (patch)
treed97e993d9bc52e9443baf40c72a5dba5903be76c
parent11861a29d51fb73ec2647398b306452948587cc5 (diff)
Fixed #17132 -- remove a leftover reference to django.conf.default.urls in Django. THanks to claudep for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17048 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/urlresolvers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
index 709a1fea11..c04345600c 100644
--- a/django/core/urlresolvers.py
+++ b/django/core/urlresolvers.py
@@ -337,8 +337,8 @@ class RegexURLResolver(LocaleRegexProvider):
if not callback:
# No handler specified in file; use default
# Lazy import, since urls.defaults imports this file
- from django.conf.urls import defaults
- callback = getattr(defaults, 'handler%s' % view_type)
+ from django.conf import urls
+ callback = getattr(urls, 'handler%s' % view_type)
return get_callable(callback), {}
def resolve403(self):