Commit 26b81220 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Fixed #14675 -- Completed removal of `from django.conf.urls.default import *` 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
parent fd904534

django/conf/project_template/urls.py

+1 −1
Original line number Diff line number Diff line 
from django.conf.urls.defaults import patterns, include, url

from django.conf.urls import patterns, include, url



# Uncomment the next two lines to enable the admin:

# from django.contrib import admin

django/conf/urls/__init__.py

+61 −0
Original line number Diff line number Diff line 
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)

django/conf/urls/defaults.py

+5 −60
Original line number Diff line number Diff line 
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)

django/conf/urls/i18n.py

+1 −1
Original line number Diff line number Diff line 
from django.conf import settings

from django.conf.urls.defaults import patterns

from django.conf.urls import patterns

from django.core.urlresolvers import LocaleRegexURLResolver



def i18n_patterns(prefix, *args):

django/conf/urls/shortcut.py

+1 −1
Original line number Diff line number Diff line 
from django.conf.urls.defaults import *

from django.conf.urls import patterns



urlpatterns = patterns('django.views',

    (r'^(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'defaults.shortcut'),