summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-12-31 09:59:51 -0500
committerTim Graham <timograham@gmail.com>2017-01-17 20:52:02 -0500
commitbc3540ce2c7cc59ec39a23ed16b14cc12f485bf3 (patch)
treec19c74d27f1a02fc5935fe1b0e9e9f5369e0c5a8
parentf65b1aee71dfb17dcf5738545db3f3fdf980fe72 (diff)
Refs #26013 -- Removed deprecated django.core.urlresolvers module.
-rw-r--r--django/core/urlresolvers.py9
-rw-r--r--docs/ref/exceptions.txt6
-rw-r--r--docs/ref/urlresolvers.txt6
-rw-r--r--docs/releases/2.0.txt2
4 files changed, 2 insertions, 21 deletions
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
deleted file mode 100644
index c7b5d2570c..0000000000
--- a/django/core/urlresolvers.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import warnings
-
-from django.urls import * # NOQA
-from django.utils.deprecation import RemovedInDjango20Warning
-
-warnings.warn(
- "Importing from django.core.urlresolvers is deprecated in favor of "
- "django.urls.", RemovedInDjango20Warning, stacklevel=2
-)
diff --git a/docs/ref/exceptions.txt b/docs/ref/exceptions.txt
index 6ce52977e8..7245bccaf8 100644
--- a/docs/ref/exceptions.txt
+++ b/docs/ref/exceptions.txt
@@ -173,12 +173,6 @@ URL Resolver exceptions
URL Resolver exceptions are defined in ``django.urls``.
-.. deprecated:: 1.10
-
- In older versions, these exceptions are located in
- ``django.core.urlresolvers``. Importing from the old location will continue
- to work until Django 2.0.
-
``Resolver404``
---------------
diff --git a/docs/ref/urlresolvers.txt b/docs/ref/urlresolvers.txt
index 3c18bf3c87..6e3ec595b1 100644
--- a/docs/ref/urlresolvers.txt
+++ b/docs/ref/urlresolvers.txt
@@ -4,12 +4,6 @@
.. module:: django.urls
-.. deprecated:: 1.10
-
- In older versions, these functions are located in
- ``django.core.urlresolvers``. Importing from the old location will continue
- to work until Django 2.0.
-
``reverse()``
=============
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index c01dc3d358..723c695533 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -340,3 +340,5 @@ these features.
* ``django.utils.functional.allow_lazy()`` is removed.
* The ``shell --plain`` option is removed.
+
+* The ``django.core.urlresolvers`` module is removed.