summaryrefslogtreecommitdiff
path: root/django
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:34:59 +0100
commitf31e9c7a9d03626e753fdb2bb9457228d71d570f (patch)
tree184cf5999596851bfc45b3fd9b8139b645e7df33 /django
parentb078ccf8bfcd105873f13141403a6057e430463d (diff)
[1.6.x] Removed thread customizations of six which are now built-in.
Backport of 7ef81b5cdd4c8eda12aa7786484a0bfde00aaaa4 from master
Diffstat (limited to 'django')
-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"))