From f31e9c7a9d03626e753fdb2bb9457228d71d570f Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 13 Nov 2014 10:30:36 +0100
Subject: [PATCH] [1.6.x] Removed thread customizations of six which are now
 built-in.

Backport of 7ef81b5cdd4c8eda12aa7786484a0bfde00aaaa4 from master
---
 django/utils/six.py     | 4 ----
 docs/topics/python3.txt | 4 ----
 2 files changed, 8 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"))
diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt
index f1a5f3c140..0c78daa7b4 100644
--- a/docs/topics/python3.txt
+++ b/docs/topics/python3.txt
@@ -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``.