diff options
| author | Tim Graham <timograham@gmail.com> | 2014-11-13 10:30:36 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-11-13 11:34:03 +0100 |
| commit | 4f5614d68ec6fa8520e80aacc27e0e30c376969b (patch) | |
| tree | b1d37c780a2812660444edc8c354db24d5c3b833 | |
| parent | 2d12a599383efff4ac1914e4cc5cf3b08cb2ff53 (diff) | |
[1.7.x] Removed thread customizations of six which are now built-in.
Backport of 7ef81b5cdd from master
| -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 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 |