summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-04-19 12:43:47 -0400
committerBenjamin Peterson <benjamin@python.org>2014-04-19 12:43:47 -0400
commitffc5cfe981bd4edfffe73f6d114338934b900251 (patch)
tree6099d7d55e0be52df3ed3d4bd9a513ac3616f312
parent4a9b20fcb0b95ae14969e0db95c7af24a329ddc9 (diff)
downloadsix-ffc5cfe981bd4edfffe73f6d114338934b900251.tar.gz
doc changes for pull request #34
-rw-r--r--CHANGES2
-rw-r--r--documentation/index.rst2
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index b32baf9..46a1376 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ This file lists the changes in each six version.
Development version
-------------------
+- Pull request #34: Add import mappings for dummy_thread.
+
- Pull request #33: Add import mappings for UserDict and UserList.
- Pull request #31: Select the implementations of dictionary iterator routines
diff --git a/documentation/index.rst b/documentation/index.rst
index 6d9b936..4f0a08e 100644
--- a/documentation/index.rst
+++ b/documentation/index.rst
@@ -477,6 +477,8 @@ Supported renames:
+------------------------------+-------------------------------------+-------------------------------------+
| ``dbm_gnu`` | :func:`py2:gdbm` | :class:`py3:dbm.gnu` |
+------------------------------+-------------------------------------+-------------------------------------+
+| ``_dummy_thread`` | :mod:`py2:dummy_thread` | :mod:`py3:_dummy_thread` |
++------------------------------+-------------------------------------+-------------------------------------+
| ``email_mime_multipart`` | :mod:`py2:email.MIMEMultipart` | :mod:`py3:email.mime.multipart` |
+------------------------------+-------------------------------------+-------------------------------------+
| ``email_mime_text`` | :mod:`py2:email.MIMEText` | :mod:`py3:email.mime.text` |