summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-10-06 16:34:15 -0400
committerBenjamin Peterson <benjamin@python.org>2013-10-06 16:34:15 -0400
commitfa8d1eebd7938b2614e798815a17e2374636feaa (patch)
tree4b3b715a03b079647e4b764d2d5337fbf63fd7f9
parentbeaabc5c598ac1690ec26e367f50d0e8cb0a4bb2 (diff)
downloadsix-fa8d1eebd7938b2614e798815a17e2374636feaa.tar.gz
add mapping for gdbm (fixes #40)
-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 78dc08f..aef0fcc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ This file lists the changes in each six version.
Development version
-------------------
+- Issue #40: Add import mapping for the Python 2 gdbm module.
+
- Issue #35: On Python versions less than 2.7, print_ now encodes unicode
strings when outputing to standard streams. (Python 2.7 handles this
automatically.)
diff --git a/documentation/index.rst b/documentation/index.rst
index 7421ad7..99c6770 100644
--- a/documentation/index.rst
+++ b/documentation/index.rst
@@ -454,6 +454,8 @@ Supported renames:
+------------------------------+-------------------------------------+-------------------------------------+
| ``cStringIO`` | :func:`py2:cStringIO.StringIO` | :class:`py3:io.StringIO` |
+------------------------------+-------------------------------------+-------------------------------------+
+| ``dbm_gnu`` | :func:`py2:gdbm` | :class:`py3:dbm.gnu` |
++------------------------------+-------------------------------------+-------------------------------------+
| ``email_mime_multipart`` | :mod:`py2:email.MIMEMultipart` | :mod:`py3:email.mime.multipart` |
+------------------------------+-------------------------------------+-------------------------------------+
| ``email_mime_text`` | :mod:`py2:email.MIMEText` | :mod:`py3:email.mime.text` |
diff --git a/six.py b/six.py
index d972faf..b3050c1 100644
--- a/six.py
+++ b/six.py
@@ -153,6 +153,7 @@ _moved_attributes = [
MovedModule("builtins", "__builtin__"),
MovedModule("configparser", "ConfigParser"),
MovedModule("copyreg", "copy_reg"),
+ MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
MovedModule("http_cookies", "Cookie", "http.cookies"),
MovedModule("html_entities", "htmlentitydefs", "html.entities"),