test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More django.conf.urls.defaults removals. Refs #17132 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2011-10-29 12:24:44 +00:00
parent 3e66913f96
commit 24f3c06e4a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/urlresolvers.py
View File

@ -336,7 +336,7 @@ class RegexURLResolver(LocaleRegexProvider):
callback = getattr(self.urlconf_module, 'handler%s' % view_type, None) callback = getattr(self.urlconf_module, 'handler%s' % view_type, None)
if not callback: if not callback:
# No handler specified in file; use default # 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 from django.conf import urls
callback = getattr(urls, 'handler%s' % view_type) callback = getattr(urls, 'handler%s' % view_type)
return get_callable(callback), {} return get_callable(callback), {}

2
tests/regressiontests/admin_custom_urls/models.py
View File

@ -31,7 +31,7 @@ class ActionAdmin(admin.ModelAdmin):
def get_urls(self): def get_urls(self):
# Add the URL of our custom 'add_view' view to the front of the URLs # Add the URL of our custom 'add_view' view to the front of the URLs
# list. Remove the existing one(s) first # 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 wrap(view):
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):