test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed thread customizations of six which are now built-in.

This commit is contained in:
Tim Graham 2014-11-13 10:30:36 +01:00
parent dec7da3c4c
commit 7ef81b5cdd
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

@ -794,7 +794,3 @@ def assertRaisesRegex(self, *args, **kwargs):
def assertRegex(self, *args, **kwargs): def assertRegex(self, *args, **kwargs):
return getattr(self, _assertRegex)(*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,10 +398,6 @@ extras.
``testcase.assertRegex`` on Python 3. ``assertRegexpMatches`` still ``testcase.assertRegex`` on Python 3. ``assertRegexpMatches`` still
exists in current Python 3 versions, but issues a warning. 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: http://docs.python.org/2/library/functions.html#unicode
.. _ __unicode__(): https://docs.python.org/2/reference/datamodel.html#object.__unicode__ .. _ __unicode__(): https://docs.python.org/2/reference/datamodel.html#object.__unicode__
.. _basestring: http://docs.python.org/2/library/functions.html#basestring .. _basestring: http://docs.python.org/2/library/functions.html#basestring