summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-11-13 10:30:36 +0100
committerTim Graham <timograham@gmail.com>2014-11-13 11:36:21 +0100
commitc83b024b37a448e3eece766a435cf148c806a22d (patch)
treed97c18fc4b69a16be051fc067a4beb084ecc1afc
parenta1dcd82b28c9c9ddb9fb790e7be7120ba339cd2e (diff)
[1.4.x] Removed thread customizations of six which are now built-in.
Backport of 7ef81b5cdd4c8eda12aa7786484a0bfde00aaaa4 from master
-rw-r--r--django/utils/six.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/django/utils/six.py b/django/utils/six.py
index ccc180c954..521a384d83 100644
--- a/django/utils/six.py
+++ b/django/utils/six.py
@@ -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"))