diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-01-09 21:35:48 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-01-09 21:35:48 -0600 |
| commit | 64fdc268911058cf7408bf1534ca498b0b9b8b3b (patch) | |
| tree | 02d494a9e18f029ec9a73e66d89056e7eb53728f /documentation | |
| parent | 7b844babe0966dd2a60811d1592b657a60d5e0de (diff) | |
| parent | c1f0212390cdb8264371bc99d4c28c4dd6da1b84 (diff) | |
| download | six-64fdc268911058cf7408bf1534ca498b0b9b8b3b.tar.gz | |
merge heads
Diffstat (limited to 'documentation')
| -rw-r--r-- | documentation/index.rst | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/documentation/index.rst b/documentation/index.rst index 7bed8fc..e17fbe1 100644 --- a/documentation/index.rst +++ b/documentation/index.rst @@ -357,6 +357,12 @@ Supported renames: +------------------------------+-------------------------------------+---------------------------------+ | ``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` | |