summaryrefslogtreecommitdiff
path: root/six.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-04-19 00:01:37 -0700
committerBenjamin Peterson <benjamin@python.org>2016-04-19 00:01:37 -0700
commitbade6bfe1598261c3e7067ecea7b8061053ce573 (patch)
treeae3e9033e4dfae12ed2ddbfc026035f56090a0e0 /six.py
parentc17283f3eec22148462448f32ead0282df221ded (diff)
parent1c6f1fdfae9933f8a5f6a8a5d55576b60a6e3acb (diff)
downloadsix-git-bade6bfe1598261c3e7067ecea7b8061053ce573.tar.gz
Merged in asottile/six (pull request #75)
Add six.moves.email_mime_image
Diffstat (limited to 'six.py')
-rw-r--r--six.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/six.py b/six.py
index e841490..e37af77 100644
--- a/six.py
+++ b/six.py
@@ -262,10 +262,11 @@ _moved_attributes = [
MovedModule("html_entities", "htmlentitydefs", "html.entities"),
MovedModule("html_parser", "HTMLParser", "html.parser"),
MovedModule("http_client", "httplib", "http.client"),
+ MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
+ MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"),
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"),
MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),