Commit f31e9c7a authored by Tim Graham's avatar Tim Graham
Browse files

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

Backport of 7ef81b5c from master
parent b078ccf8
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -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"))
+0 −4
Original line number Diff line number Diff line
@@ -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``.