diff options
| author | Tim Graham <timograham@gmail.com> | 2014-11-13 10:30:36 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-11-13 10:30:53 +0100 |
| commit | 7ef81b5cdd4c8eda12aa7786484a0bfde00aaaa4 (patch) | |
| tree | 6b745afe55fdfc5eb5b093b3b31cf24ca2184b06 | |
| parent | dec7da3c4c8fb8c4fe3e34bdbd6f23dcbc42ad4c (diff) | |
Removed thread customizations of six which are now built-in.
| -rw-r--r-- | django/utils/six.py | 4 | ||||
| -rw-r--r-- | docs/topics/python3.txt | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/django/utils/six.py b/django/utils/six.py index bbaca9bb1e..e092b0572c 100644 --- a/django/utils/six.py +++ b/django/utils/six.py @@ -794,7 +794,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 |