-
-
Notifications
You must be signed in to change notification settings - Fork 31.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed #14675 -- Completed removal of `from django.conf.urls.default i…
…mport *` usage. This applies to both our own [test] code and documentation examples. Also: * Moved the functions and handlers from `django.conf.urls.defaults` up to `django.conf.urls` deprecating the former module. * Added documentation for `handler403`. * Tweaked the URLs topic document a bit. Thanks to pupeno and cdestigter for their great work contributing patches. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
- Loading branch information
Showing
88 changed files
with
243 additions
and
198 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
from django.core.urlresolvers import (RegexURLPattern, | ||
RegexURLResolver, LocaleRegexURLResolver) | ||
from django.core.exceptions import ImproperlyConfigured | ||
from django.utils.importlib import import_module | ||
|
||
|
||
__all__ = ['handler403', 'handler404', 'handler500', 'include', 'patterns', 'url'] | ||
|
||
handler403 = 'django.views.defaults.permission_denied' | ||
handler404 = 'django.views.defaults.page_not_found' | ||
handler500 = 'django.views.defaults.server_error' | ||
|
||
def include(arg, namespace=None, app_name=None): | ||
if isinstance(arg, tuple): | ||
# callable returning a namespace hint | ||
if namespace: | ||
raise ImproperlyConfigured('Cannot override the namespace for a dynamic module that provides a namespace') | ||
urlconf_module, app_name, namespace = arg | ||
else: | ||
# No namespace hint - use manually provided namespace | ||
urlconf_module = arg | ||
|
||
if isinstance(urlconf_module, basestring): | ||
urlconf_module = import_module(urlconf_module) | ||
patterns = getattr(urlconf_module, 'urlpatterns', urlconf_module) | ||
|
||
# Make sure we can iterate through the patterns (without this, some | ||
# testcases will break). | ||
if isinstance(patterns, (list, tuple)): | ||
for url_pattern in patterns: | ||
# Test if the LocaleRegexURLResolver is used within the include; | ||
# this should throw an error since this is not allowed! | ||
if isinstance(url_pattern, LocaleRegexURLResolver): | ||
raise ImproperlyConfigured( | ||
'Using i18n_patterns in an included URLconf is not allowed.') | ||
|
||
return (urlconf_module, app_name, namespace) | ||
|
||
def patterns(prefix, *args): | ||
pattern_list = [] | ||
for t in args: | ||
if isinstance(t, (list, tuple)): | ||
t = url(prefix=prefix, *t) | ||
elif isinstance(t, RegexURLPattern): | ||
t.add_prefix(prefix) | ||
pattern_list.append(t) | ||
return pattern_list | ||
|
||
def url(regex, view, kwargs=None, name=None, prefix=''): | ||
if isinstance(view, (list,tuple)): | ||
# For include(...) processing. | ||
urlconf_module, app_name, namespace = view | ||
return RegexURLResolver(regex, urlconf_module, kwargs, app_name=app_name, namespace=namespace) | ||
else: | ||
if isinstance(view, basestring): | ||
if not view: | ||
raise ImproperlyConfigured('Empty URL pattern view name not permitted (for pattern %r)' % regex) | ||
if prefix: | ||
view = prefix + '.' + view | ||
return RegexURLPattern(regex, view, kwargs, name) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,61 +1,6 @@ | ||
from django.core.urlresolvers import (RegexURLPattern, | ||
RegexURLResolver, LocaleRegexURLResolver) | ||
from django.core.exceptions import ImproperlyConfigured | ||
from django.utils.importlib import import_module | ||
|
||
|
||
__all__ = ['handler404', 'handler500', 'include', 'patterns', 'url'] | ||
|
||
handler403 = 'django.views.defaults.permission_denied' | ||
handler404 = 'django.views.defaults.page_not_found' | ||
handler500 = 'django.views.defaults.server_error' | ||
|
||
def include(arg, namespace=None, app_name=None): | ||
if isinstance(arg, tuple): | ||
# callable returning a namespace hint | ||
if namespace: | ||
raise ImproperlyConfigured('Cannot override the namespace for a dynamic module that provides a namespace') | ||
urlconf_module, app_name, namespace = arg | ||
else: | ||
# No namespace hint - use manually provided namespace | ||
urlconf_module = arg | ||
|
||
if isinstance(urlconf_module, basestring): | ||
urlconf_module = import_module(urlconf_module) | ||
patterns = getattr(urlconf_module, 'urlpatterns', urlconf_module) | ||
|
||
# Make sure we can iterate through the patterns (without this, some | ||
# testcases will break). | ||
if isinstance(patterns, (list, tuple)): | ||
for url_pattern in patterns: | ||
# Test if the LocaleRegexURLResolver is used within the include; | ||
# this should throw an error since this is not allowed! | ||
if isinstance(url_pattern, LocaleRegexURLResolver): | ||
raise ImproperlyConfigured( | ||
'Using i18n_patterns in an included URLconf is not allowed.') | ||
|
||
return (urlconf_module, app_name, namespace) | ||
|
||
def patterns(prefix, *args): | ||
pattern_list = [] | ||
for t in args: | ||
if isinstance(t, (list, tuple)): | ||
t = url(prefix=prefix, *t) | ||
elif isinstance(t, RegexURLPattern): | ||
t.add_prefix(prefix) | ||
pattern_list.append(t) | ||
return pattern_list | ||
|
||
def url(regex, view, kwargs=None, name=None, prefix=''): | ||
if isinstance(view, (list,tuple)): | ||
# For include(...) processing. | ||
urlconf_module, app_name, namespace = view | ||
return RegexURLResolver(regex, urlconf_module, kwargs, app_name=app_name, namespace=namespace) | ||
else: | ||
if isinstance(view, basestring): | ||
if not view: | ||
raise ImproperlyConfigured('Empty URL pattern view name not permitted (for pattern %r)' % regex) | ||
if prefix: | ||
view = prefix + '.' + view | ||
return RegexURLPattern(regex, view, kwargs, name) | ||
import warnings | ||
warnings.warn("django.conf.urls.defaults is deprecated; use django.conf.urls instead", | ||
PendingDeprecationWarning) | ||
|
||
from django.conf.urls import (handler403, handler404, handler500, | ||
include, patterns, url) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.