[1.7.x] Removed thread customizations of six which are now built-in.
Backport of 7ef81b5cdd
from master
This commit is contained in:
parent
2d12a59938
commit
4f5614d68e
|
@ -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"))
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue