Commits

Marc Abramowitz  committed e81f2f6 Merge

Merge from upstream

  • Participants
  • Parent commits bc5edb4, 939cd5c

Comments (0)

Files changed (3)

 
 - Fix Jython detection.
 
+- Pull request #4: Add email_mime_multipart, email_mime_text, and
+  email_mime_base to six.moves.
+
 - Pull request #5: Add functions to moves.urllib_parse: quote, quote_plus, and
   urlparse.
 

File documentation/index.rst

 +------------------------------+-------------------------------------+--------------------------------------+
 | ``cStringIO``                | :func:`py2:cStringIO.StringIO`      | :class:`py3:io.StringIO`             |
 +------------------------------+-------------------------------------+--------------------------------------+
+| ``email_mime_multipart``     | :mod:`py2:email.MIMEMultipart`      | :mod:`py3:email.mime.multipart`      |
++------------------------------+-------------------------------------+--------------------------------------+
+| ``email_mime_text``          | :mod:`py2:email.MIMEText`           | :mod:`py3:email.mime.text`           |
++------------------------------+-------------------------------------+--------------------------------------+
+| ``email_mime_base``          | :mod:`py2:email.MIMEBase`           | :mod:`py3:email.mime.base`           |
++------------------------------+-------------------------------------+--------------------------------------+
 | ``filter``                   | :func:`py2:itertools.ifilter`       | :func:`py3:filter`                   |
 +------------------------------+-------------------------------------+--------------------------------------+
 | ``http_cookiejar``           | :mod:`py2:cookielib`                | :mod:`py3:http.cookiejar`            |
     MovedModule("html_entities", "htmlentitydefs", "html.entities"),
     MovedModule("html_parser", "HTMLParser", "html.parser"),
     MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
+    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"),