Commit 7ef81b5c authored by Tim Graham's avatar Tim Graham
Browse files

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

parent dec7da3c

django/utils/six.py

+0 −4
Original line number Diff line number Diff line
@@ -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"))

docs/topics/python3.txt

+0 −4
Original line number Diff line number Diff line
@@ -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