Commit 24f3c06e authored by Ramiro Morales's avatar Ramiro Morales
Browse files

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 3e66913f

django/core/urlresolvers.py

+1 −1
Original line number Diff line number Diff line
@@ -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), {}

tests/regressiontests/admin_custom_urls/models.py

+1 −1
Original line number Diff line number Diff line
@@ -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):