Commits

Marc Abramowitz committed 4679114

Replace documentation/index.rst with version copied from upstream since
my previous merge looked suspect. Will redo the merge manually...

Comments (0)

Files changed (1)

documentation/index.rst

 
 Supported renames:
 
-+------------------------------+-------------------------------------+-----------------------------------+
-| Name                         | Python 2 name                       | Python 3 name                     |
-+==============================+=====================================+===================================+
-| ``builtins``                 | :mod:`py2:__builtin__`              | :mod:`py3:builtins`               |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``configparser``             | :mod:`py2:ConfigParser`             | :mod:`py3:configparser`           |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``copyreg``                  | :mod:`py2:copy_reg`                 | :mod:`py3:copyreg`                |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``cPickle``                  | :mod:`py2:cPickle`                  | :mod:`py3:pickle`                 |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``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`                |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``filterfalse``              | :func:`py2:itertools.ifilterfalse`  | :func:`py3:itertools.filterfalse` |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``http_cookiejar``           | :mod:`py2:cookielib`                | :mod:`py3:http.cookiejar`         |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``http_cookies``             | :mod:`py2:Cookie`                   | :mod:`py3:http.cookies`           |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``html_entities``            | :mod:`py2:htmlentitydefs`           | :mod:`py3:html.entities`          |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``html_parser``              | :mod:`py2:HTMLParser`               | :mod:`py3:html.parser`            |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``http_client``              | :mod:`py2:httplib`                  | :mod:`py3:http.client`            |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``BaseHTTPServer``           | :mod:`py2:BaseHTTPServer`           | :mod:`py3:http.server`            |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``CGIHTTPServer``            | :mod:`py2:CGIHTTPServer`            | :mod:`py3:http.server`            |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``SimpleHTTPServer``         | :mod:`py2:SimpleHTTPServer`         | :mod:`py3:http.server`            |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``input``                    | :func:`py2:raw_input`               | :func:`py3:input`                 |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``map``                      | :func:`py2:itertools.imap`          | :func:`py3:map`                   |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``queue``                    | :mod:`py2:Queue`                    | :mod:`py3:queue`                  |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``range``                    | :func:`py2:xrange`                  | :func:`py3:range`                 |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``reduce``                   | :func:`py2:reduce`                  | :func:`py3:functools.reduce`      |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``reload_module``            | :func:`py2:reload`                  | :func:`py3:imp.reload`            |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``reprlib``                  | :mod:`py2:repr`                     | :mod:`py3:reprlib`                |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``socketserver``             | :mod:`py2:SocketServer`             | :mod:`py3:socketserver`           |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter``                  | :mod:`py2:Tkinter`                  | :mod:`py3:tkinter`                |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_dialog``           | :mod:`py2:Dialog`                   | :mod:`py3:tkinter.dialog`         |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_filedialog``       | :mod:`py2:FileDialog`               | :mod:`py3:tkinter.FileDialog`     |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_scrolledtext``     | :mod:`py2:ScrolledText`             | :mod:`py3:tkinter.scolledtext`    |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_simpledialog``     | :mod:`py2:SimpleDialog`             | :mod:`py2:tkinter.simpledialog`   |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_tix``              | :mod:`py2:Tix`                      | :mod:`py3:tkinter.tix`            |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_constants``        | :mod:`py2:Tkconstants`              | :mod:`py3:tkinter.constants`      |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_dnd``              | :mod:`py2:Tkdnd`                    | :mod:`py3:tkinter.dnd`            |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_colorchooser``     | :mod:`py2:tkColorChooser`           | :mod:`py3:tkinter.colorchooser`   |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_commondialog``     | :mod:`py2:tkCommonDialog`           | :mod:`py3:tkinter.commondialog`   |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_tkfiledialog``     | :mod:`py2:tkFileDialog`             | :mod:`py3:tkinter.filedialog`     |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_font``             | :mod:`py2:tkFont`                   | :mod:`py3:tkinter.font`           |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_messagebox``       | :mod:`py2:tkMessageBox`             | :mod:`py3:tkinter.messagebox`     |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``tkinter_tksimpledialog``   | :mod:`py2:tkSimpleDialog`           | :mod:`py3:tkinter.simpledialog`   |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``urllib.parse``             | See :mod:`six.moves.urllib.parse`   | :mod:`py3:urllib.parse`           |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``urllib.error``             | See :mod:`six.moves.urllib.error`   | :mod:`py3:urllib.error`           |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``urllib.request``           | See :mod:`six.moves.urllib.request` | :mod:`py3:urllib.request`         |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``urllib.response``          | See :mod:`six.moves.urllib.response`| :mod:`py3:urllib.response`        |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``urllib.robotparser``       | :mod:`py2:robotparser`              | :mod:`py3:urllib.robotparser`     |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``urllib_robotparser``       | :mod:`py2:robotparser`              | :mod:`py3:urllib.robotparser`     |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``winreg``                   | :mod:`py2:_winreg`                  | :mod:`py3:winreg`                 |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``xrange``                   | :func:`py2:xrange`                  | :func:`py3:range`                 |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``zip``                      | :func:`py2:itertools.izip`          | :func:`py3:zip`                   |
-+------------------------------+-------------------------------------+-----------------------------------+
-| ``zip_longest``              | :func:`py2:itertools.izip_longest`  | :func:`py3:itertools.zip_longest` |
-+------------------------------+-------------------------------------+-----------------------------------+
-
-six.moves.urllib.parse
-<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-.. module:: six.moves.urllib.parse
-   :synopsis: Stuff from :mod:`py2:urlparse` and :mod:`py2:urllib` in Python 2 and :mod:`py3:urllib.parse` in Python 3
-
-Contains functions from Python 3's :mod:`py3:urllib.parse` and Python 2's:
-
-:mod:`py2:urlparse`:
-
-* :func:`py2:urlparse.urlparse`
-* :func:`py2:urlparse.urlunparse`
-* :func:`py2:urlparse.parse_qs`
-* :func:`py2:urlparse.parse_qsl`
-* :func:`py2:urlparse.urljoin`
-* :func:`py2:urlparse.urldefrag`
-* :func:`py2:urlparse.urlsplit`
-* :func:`py2:urlparse.urlunsplit`
-
-and :mod:`py2:urllib`:
-
-* :func:`py2:urllib.quote`
-* :func:`py2:urllib.quote_plus`
-* :func:`py2:urllib.unquote`
-* :func:`py2:urllib.unquote_plus`
-* :func:`py2:urllib.urlencode`
-
-
-six.moves.urllib.error
-<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-.. module:: six.moves.urllib.error
-   :synopsis: Stuff from :mod:`py2:urllib` and :mod:`py2:urllib2` in Python 2 and :mod:`py3:urllib.error` in Python 3
-
-Contains exceptions from Python 3's :mod:`py3:urllib.error` and Python 2's:
-
-:mod:`py2:urllib`:
-
-* :exc:`py2:urllib.ContentTooShortError`
-
-and :mod:`py2:urllib2`:
-
-* :exc:`py2:urllib2.URLError`
-* :exc:`py2:urllib2.HTTPError`
-
-
-six.moves.urllib.request
-<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-.. module:: six.moves.urllib.request
-   :synopsis: Stuff from :mod:`py2:urllib` and :mod:`py2:urllib2` in Python 2 and :mod:`py3:urllib.request` in Python 3
-
-Contains items from Python 3's :mod:`py3:urllib.request` and Python 2's:
-
-:mod:`py2:urllib`:
-
-* :func:`py2:urllib.pathname2url`
-* :func:`py2:urllib.url2pathname`
-* :func:`py2:urllib.getproxies`
-* :func:`py2:urllib.urlretrieve`
-* :func:`py2:urllib.urlcleanup`
-* :class:`py2:urllib.URLopener`
-* :class:`py2:urllib.FancyURLopener`
-
-and :mod:`py2:urllib2`:
-
-* :func:`py2:urllib2.urlopen`
-* :func:`py2:urllib2.install_opener`
-* :func:`py2:urllib2.build_opener`
-* :class:`py2:urllib2.Request`
-* :class:`py2:urllib2.OpenerDirector`
-* :class:`py2:urllib2.HTTPDefaultErrorHandler`
-* :class:`py2:urllib2.HTTPRedirectHandler`
-* :class:`py2:urllib2.HTTPCookieProcessor`
-* :class:`py2:urllib2.ProxyHandler`
-* :class:`py2:urllib2.BaseHandler`
-* :class:`py2:urllib2.HTTPPasswordMgr`
-* :class:`py2:urllib2.HTTPPasswordMgrWithDefaultRealm`
-* :class:`py2:urllib2.AbstractBasicAuthHandler`
-* :class:`py2:urllib2.HTTPBasicAuthHandler`
-* :class:`py2:urllib2.ProxyBasicAuthHandler`
-* :class:`py2:urllib2.AbstractDigestAuthHandler`
-* :class:`py2:urllib2.HTTPDigestAuthHandler`
-* :class:`py2:urllib2.ProxyDigestAuthHandler`
-* :class:`py2:urllib2.HTTPHandler`
-* :class:`py2:urllib2.HTTPSHandler`
-* :class:`py2:urllib2.FileHandler`
-* :class:`py2:urllib2.FTPHandler`
-* :class:`py2:urllib2.CacheFTPHandler`
-* :class:`py2:urllib2.UnknownHandler`
-* :class:`py2:urllib2.HTTPErrorProcessor`
-
-
-six.moves.urllib.response
-<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-.. module:: six.moves.urllib.response
-   :synopsis: Stuff from :mod:`py2:urllib` in Python 2 and :mod:`py3:urllib.response` in Python 3
-
-Contains classes from Python 3's :mod:`py3:urllib.response` and Python 2's:
-
-:mod:`py2:urllib`:
-
-* :class:`py2:urllib.addbase`
-* :class:`py2:urllib.addclosehook`
-* :class:`py2:urllib.addinfo`
-* :class:`py2:urllib.addinfourl`
-
++------------------------------+-------------------------------------+-------------------------------------+
+| Name                         | Python 2 name                       | Python 3 name                       |
++==============================+=====================================+=====================================+
+| ``builtins``                 | :mod:`py2:__builtin__`              | :mod:`py3:builtins`                 |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``configparser``             | :mod:`py2:ConfigParser`             | :mod:`py3:configparser`             |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``copyreg``                  | :mod:`py2:copy_reg`                 | :mod:`py3:copyreg`                  |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``cPickle``                  | :mod:`py2:cPickle`                  | :mod:`py3:pickle`                   |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``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`                  |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``filterfalse``              | :func:`py2:itertools.ifilterfalse`  | :func:`py3:itertools.filterfalse`   |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``http_cookiejar``           | :mod:`py2:cookielib`                | :mod:`py3:http.cookiejar`           |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``http_cookies``             | :mod:`py2:Cookie`                   | :mod:`py3:http.cookies`             |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``html_entities``            | :mod:`py2:htmlentitydefs`           | :mod:`py3:html.entities`            |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``html_parser``              | :mod:`py2:HTMLParser`               | :mod:`py3:html.parser`              |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``http_client``              | :mod:`py2:httplib`                  | :mod:`py3:http.client`              |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``BaseHTTPServer``           | :mod:`py2:BaseHTTPServer`           | :mod:`py3:http.server`              |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``CGIHTTPServer``            | :mod:`py2:CGIHTTPServer`            | :mod:`py3:http.server`              |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``SimpleHTTPServer``         | :mod:`py2:SimpleHTTPServer`         | :mod:`py3:http.server`              |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``input``                    | :func:`py2:raw_input`               | :func:`py3:input`                   |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``map``                      | :func:`py2:itertools.imap`          | :func:`py3:map`                     |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``queue``                    | :mod:`py2:Queue`                    | :mod:`py3:queue`                    |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``range``                    | :func:`py2:xrange`                  | :func:`py3:range`                   |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``reduce``                   | :func:`py2:reduce`                  | :func:`py3:functools.reduce`        |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``reload_module``            | :func:`py2:reload`                  | :func:`py3:imp.reload`              |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``reprlib``                  | :mod:`py2:repr`                     | :mod:`py3:reprlib`                  |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``socketserver``             | :mod:`py2:SocketServer`             | :mod:`py3:socketserver`             |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter``                  | :mod:`py2:Tkinter`                  | :mod:`py3:tkinter`                  |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_dialog``           | :mod:`py2:Dialog`                   | :mod:`py3:tkinter.dialog`           |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_filedialog``       | :mod:`py2:FileDialog`               | :mod:`py3:tkinter.FileDialog`       |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_scrolledtext``     | :mod:`py2:ScrolledText`             | :mod:`py3:tkinter.scolledtext`      |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_simpledialog``     | :mod:`py2:SimpleDialog`             | :mod:`py2:tkinter.simpledialog`     |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_tix``              | :mod:`py2:Tix`                      | :mod:`py3:tkinter.tix`              |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_constants``        | :mod:`py2:Tkconstants`              | :mod:`py3:tkinter.constants`        |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_dnd``              | :mod:`py2:Tkdnd`                    | :mod:`py3:tkinter.dnd`              |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_colorchooser``     | :mod:`py2:tkColorChooser`           | :mod:`py3:tkinter.colorchooser`     |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_commondialog``     | :mod:`py2:tkCommonDialog`           | :mod:`py3:tkinter.commondialog`     |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_tkfiledialog``     | :mod:`py2:tkFileDialog`             | :mod:`py3:tkinter.filedialog`       |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_font``             | :mod:`py2:tkFont`                   | :mod:`py3:tkinter.font`             |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_messagebox``       | :mod:`py2:tkMessageBox`             | :mod:`py3:tkinter.messagebox`       |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``tkinter_tksimpledialog``   | :mod:`py2:tkSimpleDialog`           | :mod:`py3:tkinter.simpledialog`     |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``urllib_robotparser``       | :mod:`py2:robotparser`              | :mod:`py3:urllib.robotparser`       |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``UserString``               | :class:`py2:UserString.UserString`  | :class:`py3:collections.UserString` |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``winreg``                   | :mod:`py2:_winreg`                  | :mod:`py3:winreg`                   |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``xrange``                   | :func:`py2:xrange`                  | :func:`py3:range`                   |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``zip``                      | :func:`py2:itertools.izip`          | :func:`py3:zip`                     |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``zip_longest``              | :func:`py2:itertools.izip_longest`  | :func:`py3:itertools.zip_longest`   |
++------------------------------+-------------------------------------+-------------------------------------+
 
 Advanced - Customizing renames
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<