summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/utils/six.py4
-rw-r--r--docs/topics/python3.txt4
2 files changed, 0 insertions, 8 deletions
diff --git a/django/utils/six.py b/django/utils/six.py
index 702296f727..cb5c2e373e 100644
--- a/django/utils/six.py
+++ b/django/utils/six.py
@@ -788,7 +788,3 @@ def assertRaisesRegex(self, *args, **kwargs):
def assertRegex(self, *args, **kwargs):
return getattr(self, _assertRegex)(*args, **kwargs)
-
-
-add_move(MovedModule("_dummy_thread", "dummy_thread"))
-add_move(MovedModule("_thread", "thread"))
diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt
index 7769fe8537..d8a2f646bd 100644
--- a/docs/topics/python3.txt
+++ b/docs/topics/python3.txt
@@ -398,10 +398,6 @@ extras.
``testcase.assertRegex`` on Python 3. ``assertRegexpMatches`` still
exists in current Python 3 versions, but issues a warning.
-
-In addition to six' defaults moves, Django's version provides ``thread`` as
-``_thread`` and ``dummy_thread`` as ``_dummy_thread``.
-
.. _unicode: http://docs.python.org/2/library/functions.html#unicode
.. _ __unicode__(): https://docs.python.org/2/reference/datamodel.html#object.__unicode__
.. _basestring: http://docs.python.org/2/library/functions.html#basestring