summaryrefslogtreecommitdiff
path: root/django/utils
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:03 +0100
commit4f5614d68ec6fa8520e80aacc27e0e30c376969b (patch)
treeb1d37c780a2812660444edc8c354db24d5c3b833 /django/utils
parent2d12a599383efff4ac1914e4cc5cf3b08cb2ff53 (diff)
[1.7.x] Removed thread customizations of six which are now built-in.
Backport of 7ef81b5cdd from master
Diffstat (limited to 'django/utils')
-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 702296f727..cb5c2e373e 100644
--- a/django/utils/six.py
+++ b/django/utils/six.py
@@ -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"))