summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-10-06 16:38:22 -0400
committerBenjamin Peterson <benjamin@python.org>2013-10-06 16:38:22 -0400
commitb39574d169f7751e70ab4f6faa0fe8683702de6f (patch)
treecca1c48814ab05bfdf3aba15c5828d19cf569324
parentfa8d1eebd7938b2614e798815a17e2374636feaa (diff)
downloadsix-b39574d169f7751e70ab4f6faa0fe8683702de6f.tar.gz
mapping for _thread module (fixes #39)
-rw-r--r--CHANGES2
-rw-r--r--documentation/index.rst2
-rw-r--r--six.py1
3 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index aef0fcc..73c38a9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ This file lists the changes in each six version.
Development version
-------------------
+- Issue #39: Add import mapping for the Python 2 thread module.
+
- Issue #40: Add import mapping for the Python 2 gdbm module.
- Issue #35: On Python versions less than 2.7, print_ now encodes unicode
diff --git a/documentation/index.rst b/documentation/index.rst
index 99c6770..248c706 100644
--- a/documentation/index.rst
+++ b/documentation/index.rst
@@ -498,6 +498,8 @@ Supported renames:
+------------------------------+-------------------------------------+-------------------------------------+
| ``socketserver`` | :mod:`py2:SocketServer` | :mod:`py3:socketserver` |
+------------------------------+-------------------------------------+-------------------------------------+
+| ``_thread`` | :mod:`py2:thread` | :mod:`py3:_thread` |
++------------------------------+-------------------------------------+-------------------------------------+
| ``tkinter`` | :mod:`py2:Tkinter` | :mod:`py3:tkinter` |
+------------------------------+-------------------------------------+-------------------------------------+
| ``tkinter_dialog`` | :mod:`py2:Dialog` | :mod:`py3:tkinter.dialog` |
diff --git a/six.py b/six.py
index b3050c1..f3a572c 100644
--- a/six.py
+++ b/six.py
@@ -169,6 +169,7 @@ _moved_attributes = [
MovedModule("queue", "Queue"),
MovedModule("reprlib", "repr"),
MovedModule("socketserver", "SocketServer"),
+ MovedModule("_thread", "thread", "_thread"),
MovedModule("tkinter", "Tkinter"),
MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),