summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Yan <felixonmars@gmail.com>2014-07-15 14:56:27 +0800
committerFelix Yan <felixonmars@gmail.com>2014-07-15 14:56:27 +0800
commit5ec34672c9369947aaf0450bb791c8d18339d3f4 (patch)
tree4eea7e7e48d1627f54b838c3b37eb1d90e164825
parentf0013a9984d7b15bfc2326a908fd7c13b750cc2c (diff)
downloadsix-5ec34672c9369947aaf0450bb791c8d18339d3f4.tar.gz
Add email_mime_nonmultipart as MovedModule
-rw-r--r--documentation/index.rst2
-rw-r--r--six.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/documentation/index.rst b/documentation/index.rst
index 49aed01..2de3622 100644
--- a/documentation/index.rst
+++ b/documentation/index.rst
@@ -489,6 +489,8 @@ Supported renames:
+------------------------------+-------------------------------------+-------------------------------------+
| ``email_mime_multipart`` | :mod:`py2:email.MIMEMultipart` | :mod:`py3:email.mime.multipart` |
+------------------------------+-------------------------------------+-------------------------------------+
+| ``email_mime_nonmultipart`` | :mod:`py2:email.MIMENonMultipart` | :mod:`py3:email.mime.nonmultipart` |
++------------------------------+-------------------------------------+-------------------------------------+
| ``email_mime_text`` | :mod:`py2:email.MIMEText` | :mod:`py3:email.mime.text` |
+------------------------------+-------------------------------------+-------------------------------------+
| ``email_mime_base`` | :mod:`py2:email.MIMEBase` | :mod:`py3:email.mime.base` |
diff --git a/six.py b/six.py
index 35c82f0..b1c063a 100644
--- a/six.py
+++ b/six.py
@@ -248,6 +248,7 @@ _moved_attributes = [
MovedModule("html_parser", "HTMLParser", "html.parser"),
MovedModule("http_client", "httplib", "http.client"),
MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
+ MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),