[WIP] URL dispatcher API.

django/conf/urls/__init__.py

@@ -2,13 +2,15 @@
 from importlib import import_module
 
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import (
-    LocaleRegexURLResolver, RegexURLPattern, RegexURLResolver,
+from django.urls import (
+    BaseResolver, LocalePrefix, LocalizedRegexPattern, RegexPattern, Resolver,
+    ResolverEndpoint,
 )
 from django.utils import six
 from django.utils.deprecation import (
     RemovedInDjango20Warning, RemovedInDjango110Warning,
 )
+from django.utils.functional import Promise
 
 __all__ = ['handler400', 'handler403', 'handler404', 'handler500', 'include', 'patterns', 'url']
 
@@ -66,10 +68,10 @@ def include(arg, namespace=None, app_name=None):
     # Make sure we can iterate through the patterns (without this, some
     # testcases will break).
     if isinstance(patterns, (list, tuple)):
-        for url_pattern in patterns:
+        for name, resolver 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):
+            if any(isinstance(constraint, LocalePrefix) for constraint in resolver.constraints):
                 raise ImproperlyConfigured(
                     'Using i18n_patterns in an included URLconf is not allowed.')
 
@@ -86,28 +88,35 @@ 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)
+            if len(t) != 2 or not isinstance(t[1], BaseResolver):
+                t = url(prefix=prefix, *t)
+            elif len(t) == 2 and isinstance(t[1], ResolverEndpoint):
+                t[1].add_prefix(prefix)
         pattern_list.append(t)
     return pattern_list
 
 
-def url(regex, view, kwargs=None, name=None, prefix=''):
+def url(constraints, view, kwargs=None, name=None, prefix='', decorators=None):
+    if isinstance(constraints, six.string_types):
+        constraints = RegexPattern(constraints)
+    elif isinstance(constraints, Promise):
+        constraints = LocalizedRegexPattern(constraints)
+    if not isinstance(constraints, (list, tuple)):
+        constraints = [constraints]
+
     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)
+        resolvers, app_name, namespace = view
+        return namespace, Resolver(resolvers, app_name, constraints=constraints, kwargs=kwargs, decorators=decorators)
     else:
         if isinstance(view, six.string_types):
             warnings.warn(
                 'Support for string view arguments to url() is deprecated and '
-                'will be removed in Django 1.10 (got %s). Pass the callable '
+                'will be removed in Django 2.0 (got %s). Pass the callable '
                 'instead.' % view,
                 RemovedInDjango110Warning, stacklevel=2
             )
             if not view:
-                raise ImproperlyConfigured('Empty URL pattern view name not permitted (for pattern %r)' % regex)
+                raise ImproperlyConfigured('Empty URL pattern view name not permitted (for pattern %r)' % constraints)
             if prefix:
                 view = prefix + '.' + view
-        return RegexURLPattern(regex, view, kwargs, name)
+        return None, ResolverEndpoint(view, name, constraints=constraints, kwargs=kwargs, decorators=decorators)

django/conf/urls/i18n.py

@@ -2,7 +2,7 @@
 
 from django.conf import settings
 from django.conf.urls import patterns, url
-from django.core.urlresolvers import LocaleRegexURLResolver
+from django.urls import LocalePrefix, Resolver
 from django.utils import six
 from django.utils.deprecation import RemovedInDjango110Warning
 from django.views.i18n import set_language
@@ -27,7 +27,7 @@ def i18n_patterns(prefix, *args):
         pattern_list = [prefix] + list(args)
     if not settings.USE_I18N:
         return pattern_list
-    return [LocaleRegexURLResolver(pattern_list)]
+    return [(None, Resolver(pattern_list, constraints=[LocalePrefix()]))]
 
 
 urlpatterns = [

django/contrib/admin/models.py

@@ -3,8 +3,8 @@
 from django.conf import settings
 from django.contrib.admin.utils import quote
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import NoReverseMatch, reverse
 from django.db import models
+from django.urls import NoReverseMatch, reverse
 from django.utils.encoding import python_2_unicode_compatible, smart_text
 from django.utils.translation import ugettext, ugettext_lazy as _
 

django/contrib/admin/options.py

@@ -22,7 +22,6 @@
     FieldDoesNotExist, FieldError, PermissionDenied, ValidationError,
 )
 from django.core.paginator import Paginator
-from django.core.urlresolvers import reverse
 from django.db import models, router, transaction
 from django.db.models.constants import LOOKUP_SEP
 from django.db.models.fields import BLANK_CHOICE_DASH
@@ -35,6 +34,7 @@
 from django.http import Http404, HttpResponseRedirect
 from django.http.response import HttpResponseBase
 from django.template.response import SimpleTemplateResponse, TemplateResponse
+from django.urls import reverse
 from django.utils import six
 from django.utils.decorators import method_decorator
 from django.utils.encoding import force_text, python_2_unicode_compatible

django/contrib/admin/sites.py

@@ -5,11 +5,11 @@
 from django.contrib.admin import ModelAdmin, actions
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
-from django.core.urlresolvers import NoReverseMatch, reverse
 from django.db.models.base import ModelBase
 from django.http import Http404, HttpResponseRedirect
 from django.template.engine import Engine
 from django.template.response import TemplateResponse
+from django.urls import NoReverseMatch, reverse
 from django.utils import six
 from django.utils.text import capfirst
 from django.utils.translation import ugettext as _, ugettext_lazy

django/contrib/admin/templatetags/admin_list.py

@@ -11,10 +11,10 @@
     ALL_VAR, ORDER_VAR, PAGE_VAR, SEARCH_VAR,
 )
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import NoReverseMatch
 from django.db import models
 from django.template import Library
 from django.template.loader import get_template
+from django.urls import NoReverseMatch
 from django.utils import formats
 from django.utils.encoding import force_text
 from django.utils.html import escapejs, format_html

django/contrib/admin/templatetags/admin_urls.py

@@ -1,6 +1,6 @@
 from django import template
 from django.contrib.admin.utils import quote
-from django.core.urlresolvers import Resolver404, get_script_prefix, resolve
+from django.urls import Resolver404, get_script_prefix, resolve
 from django.utils.http import urlencode
 from django.utils.six.moves.urllib.parse import parse_qsl, urlparse, urlunparse
 
@@ -22,6 +22,11 @@ def add_preserved_filters(context, url, popup=False, to_field=None):
     opts = context.get('opts')
     preserved_filters = context.get('preserved_filters')
 
+    try:
+        request = context.request
+    except AttributeError:
+        request = None
+
     parsed_url = list(urlparse(url))
     parsed_qs = dict(parse_qsl(parsed_url[4]))
     merged_qs = dict()
@@ -31,7 +36,7 @@ def add_preserved_filters(context, url, popup=False, to_field=None):
 
         match_url = '/%s' % url.partition(get_script_prefix())[2]
         try:
-            match = resolve(match_url)
+            match = resolve(match_url, request=request)
         except Resolver404:
             pass
         else:

django/contrib/admin/utils.py

@@ -6,12 +6,12 @@
 
 from django.contrib.auth import get_permission_codename
 from django.core.exceptions import FieldDoesNotExist
-from django.core.urlresolvers import NoReverseMatch, reverse
 from django.db import models
 from django.db.models.constants import LOOKUP_SEP
 from django.db.models.deletion import Collector
 from django.db.models.sql.constants import QUERY_TERMS
 from django.forms.forms import pretty_name
+from django.urls import NoReverseMatch, reverse
 from django.utils import formats, six, timezone
 from django.utils.encoding import force_str, force_text, smart_text
 from django.utils.html import format_html

django/contrib/admin/views/main.py

@@ -15,8 +15,8 @@
     FieldDoesNotExist, ImproperlyConfigured, SuspiciousOperation,
 )
 from django.core.paginator import InvalidPage
-from django.core.urlresolvers import reverse
 from django.db import models
+from django.urls import reverse
 from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.http import urlencode

django/contrib/admin/widgets.py

@@ -7,11 +7,11 @@
 
 from django import forms
 from django.contrib.admin.templatetags.admin_static import static
-from django.core.urlresolvers import reverse
 from django.db.models.deletion import CASCADE
 from django.forms.utils import flatatt
 from django.forms.widgets import RadioFieldRenderer
 from django.template.loader import render_to_string
+from django.urls import reverse
 from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.html import (

django/contrib/admindocs/utils.py

@@ -4,7 +4,7 @@
 from email.errors import HeaderParseError
 from email.parser import HeaderParser
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.encoding import force_bytes
 from django.utils.safestring import mark_safe
 

django/contrib/admindocs/views.py

@@ -3,16 +3,17 @@
 import re
 from importlib import import_module
 
+from django import urls
 from django.apps import apps
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.admindocs import utils
-from django.core import urlresolvers
 from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
 from django.db import models
 from django.http import Http404
 from django.template.engine import Engine
+from django.urls.utils import get_mod_func
 from django.utils.decorators import method_decorator
 from django.utils.inspect import func_has_no_args
 from django.utils.translation import ugettext as _
@@ -35,7 +36,7 @@ def dispatch(self, request, *args, **kwargs):
         return super(BaseAdminDocsView, self).dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        kwargs.update({'root_path': urlresolvers.reverse('admin:index')})
+        kwargs.update({'root_path': urls.reverse('admin:index')})
         kwargs.update(admin.site.each_context(self.request))
         return super(BaseAdminDocsView, self).get_context_data(**kwargs)
 
@@ -144,9 +145,9 @@ class ViewDetailView(BaseAdminDocsView):
 
     def get_context_data(self, **kwargs):
         view = self.kwargs['view']
-        urlconf = urlresolvers.get_urlconf()
-        if urlresolvers.get_resolver(urlconf)._is_callback(view):
-            mod, func = urlresolvers.get_mod_func(view)
+        urlconf = urls.get_urlconf()
+        if urls.get_resolver(urlconf)._is_callback(view):
+            mod, func = get_mod_func(view)
             view_func = getattr(import_module(mod), func)
         else:
             raise Http404
@@ -344,25 +345,25 @@ def extract_views_from_urlpatterns(urlpatterns, base='', namespace=None):
     Each object in the returned list is a two-tuple: (view_func, regex)
     """
     views = []
-    for p in urlpatterns:
-        if hasattr(p, 'url_patterns'):
+    for name, resolver in urlpatterns:
+        if hasattr(resolver, 'resolvers'):
             try:
-                patterns = p.url_patterns
+                sub_resolvers = resolver.resolvers
             except ImportError:
                 continue
             views.extend(extract_views_from_urlpatterns(
-                patterns,
-                base + p.regex.pattern,
-                (namespace or []) + (p.namespace and [p.namespace] or [])
+                sub_resolvers,
+                base + ''.join(c.describe() for c in resolver.constraints),
+                (namespace or []) + (name and [name] or [])
             ))
-        elif hasattr(p, 'callback'):
+        elif hasattr(resolver, 'func'):
             try:
-                views.append((p.callback, base + p.regex.pattern,
-                              namespace, p.name))
+                views.append((resolver.func, base + ''.join(c.describe() for c in resolver.constraints),
+                              namespace, resolver.url_name))
             except ViewDoesNotExist:
                 continue
         else:
-            raise TypeError(_("%s does not appear to be a urlpattern object") % p)
+            raise TypeError(_("%s does not appear to be a resolver object") % resolver)
     return views
 
 named_group_matcher = re.compile(r'\(\?P(<\w+>).+?\)')

django/contrib/auth/admin.py

@@ -9,10 +9,10 @@
 )
 from django.contrib.auth.models import Group, User
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.http import Http404, HttpResponseRedirect
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.utils.encoding import force_text
 from django.utils.html import escape

django/contrib/auth/views.py

@@ -13,10 +13,10 @@
 )
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.shortcuts import get_current_site
-from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, QueryDict
 from django.shortcuts import resolve_url
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.deprecation import (
     RemovedInDjango20Warning, RemovedInDjango110Warning,
 )

django/contrib/flatpages/models.py

@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import get_script_prefix
 from django.db import models
+from django.urls import get_script_prefix
 from django.utils.encoding import iri_to_uri, python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 

django/contrib/gis/sitemaps/kml.py

@@ -1,7 +1,7 @@
+from django import urls
 from django.apps import apps
 from django.contrib.gis.db.models.fields import GeometryField
 from django.contrib.sitemaps import Sitemap
-from django.core import urlresolvers
 from django.db import models
 
 
@@ -56,12 +56,12 @@ def items(self):
         return self.locations
 
     def location(self, obj):
-        return urlresolvers.reverse('django.contrib.gis.sitemaps.views.%s' % self.geo_format,
-                                    kwargs={'label': obj[0],
-                                            'model': obj[1],
-                                            'field_name': obj[2],
-                                            }
-                                    )
+        return urls.reverse('django.contrib.gis.sitemaps.views.%s' % self.geo_format,
+                            kwargs={'label': obj[0],
+                                    'model': obj[1],
+                                    'field_name': obj[2],
+                                    }
+                            )
 
 
 class KMZSitemap(KMLSitemap):

django/contrib/sitemaps/__init__.py

@@ -1,6 +1,7 @@
+from django import urls
 from django.apps import apps as django_apps
 from django.conf import settings
-from django.core import paginator, urlresolvers
+from django.core import paginator
 from django.core.exceptions import ImproperlyConfigured
 from django.utils import translation
 from django.utils.six.moves.urllib.parse import urlencode
@@ -18,17 +19,17 @@ def ping_google(sitemap_url=None, ping_url=PING_URL):
     Alerts Google that the sitemap for the current site has been updated.
     If sitemap_url is provided, it should be an absolute path to the sitemap
     for this site -- e.g., '/sitemap.xml'. If sitemap_url is not provided, this
-    function will attempt to deduce it by using urlresolvers.reverse().
+    function will attempt to deduce it by using urls.reverse().
     """
     if sitemap_url is None:
         try:
             # First, try to get the "index" sitemap URL.
-            sitemap_url = urlresolvers.reverse('django.contrib.sitemaps.views.index')
-        except urlresolvers.NoReverseMatch:
+            sitemap_url = urls.reverse('django.contrib.sitemaps.views.index')
+        except urls.NoReverseMatch:
             try:
                 # Next, try for the "global" sitemap URL.
-                sitemap_url = urlresolvers.reverse('django.contrib.sitemaps.views.sitemap')
-            except urlresolvers.NoReverseMatch:
+                sitemap_url = urls.reverse('django.contrib.sitemaps.views.sitemap')
+            except urls.NoReverseMatch:
                 pass
 
     if sitemap_url is None: