mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-16 13:24:38 +00:00
Code Issues 32 Releases Wiki Activity

[1.6.x] Removed thread customizations of six which are now built-in.

Browse Source 
Backport of 7ef81b5cdd4c8eda12aa7786484a0bfde00aaaa4 from master
This commit is contained in:
Tim Graham 2014-11-13 10:30:36 +01:00
parent b078ccf8bf
commit f31e9c7a9d
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/utils/six.py
View File

@ -786,7 +786,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"))

4
docs/topics/python3.txt
View File

@ -398,7 +398,3 @@ extras.
This replaces ``testcase.assertRegexpMatches`` on Python 2, and
``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``.