Commit 16411b84 authored by Marten Kenbeek's avatar Marten Kenbeek Committed by Tim Graham
Browse files

Fixed #26013 -- Moved django.core.urlresolvers to django.urls. 

Thanks to Tim Graham for the review.
parent df3d5b1d

django/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ def setup(set_prefix=True): 
    """

    from django.apps import apps

    from django.conf import settings

    from django.core.urlresolvers import set_script_prefix

    from django.urls import set_script_prefix

    from django.utils.encoding import force_text

    from django.utils.log import configure_logging

django/conf/urls/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ import warnings 
from importlib import import_module



from django.core.exceptions import ImproperlyConfigured

from django.core.urlresolvers import (

from django.urls import (

    LocaleRegexURLResolver, RegexURLPattern, RegexURLResolver,

)

from django.utils import six

django/conf/urls/i18n.py

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

from django.conf.urls import url

from django.core.urlresolvers import LocaleRegexURLResolver

from django.urls import LocaleRegexURLResolver

from django.views.i18n import set_language

django/contrib/admin/models.py

+1 −1
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ from __future__ import unicode_literals 
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 import timezone

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ from django.core.exceptions import ( 
    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
@@ -37,6 +36,7 @@ from django.forms.widgets import CheckboxSelectMultiple, SelectMultiple 
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