Replace six with the current version which passes checklicenses.py.

third_party/six/documentation/index.rst

 Six: Python 2 and 3 Compatibility Library
 =========================================
 
 .. module:: six
    :synopsis: Python 2 and 3 compatibility
 
 .. moduleauthor:: Benjamin Peterson <benjamin@python.org>
 .. sectionauthor:: Benjamin Peterson <benjamin@python.org>
 
 
@@ skipping 214 matching lines @@
 
 
 .. function:: create_bound_method(func, obj)
 
    Return a method object wrapping *func* and bound to *obj*.  On both Python 2
    and 3, this will return a :func:`py3:types.MethodType` object.  The reason
    this wrapper exists is that on Python 2, the ``MethodType`` constructor
    requires the *obj*'s class to be passed.
 
 
+.. function:: create_unbound_method(func, cls)
+
+   Return an unbound method object wrapping *func*.  In Python 2, this will
+   return a :func:`py2:types.MethodType` object.  In Python 3, unbound methods
+   do not exist and this wrapper will simply return *func*.
+
+
 .. class:: Iterator
 
    A class for making portable iterators. The intention is that it be subclassed
    and subclasses provide a ``__next__`` method. In Python 2, :class:`Iterator`
    has one method: ``next``. It simply delegates to ``__next__``. An alternate
    way to do this would be to simply alias ``next`` to ``__next__``. However,
    this interacts badly with subclasses that override
    ``__next__``. :class:`Iterator` is empty on Python 3. (In fact, it is just
    aliased to :class:`py3:object`.)
 
@@ skipping 131 matching lines @@
 
    A "fake" unicode literal.  *text* should always be a normal string literal.
    In Python 2, :func:`u` returns unicode, and in Python 3, a string.  Also, in
    Python 2, the string is decoded with the ``unicode-escape`` codec, which
    allows unicode escapes to be used in it.
 
 
    .. note::
 
       In Python 3.3, the ``u`` prefix has been reintroduced. Code that only
-      supports Python 3 versions greater than 3.3 thus does not need
+      supports Python 3 versions of 3.3 and higher thus does not need
       :func:`u`.
 
    .. note::
 
       On Python 2, :func:`u` doesn't know what the encoding of the literal
       is. Each byte is converted directly to the unicode codepoint of the same
       value. Because of this, it's only safe to use :func:`u` with strings of
       ASCII data.
 
 
@@ skipping 166 matching lines @@
 | ``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`          |
 +------------------------------+-------------------------------------+-------------------------------------+
 | ``filter``                   | :func:`py2:itertools.ifilter`       | :func:`py3:filter`                  |
 +------------------------------+-------------------------------------+-------------------------------------+
 | ``filterfalse``              | :func:`py2:itertools.ifilterfalse`  | :func:`py3:itertools.filterfalse`   |
 +------------------------------+-------------------------------------+-------------------------------------+
+| ``getcwd``                   | :func:`py2:os.getcwdu`              | :func:`py3:os.getcwd`               |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``getcwdb``                  | :func:`py2:os.getcwd`               | :func:`py3:os.getcwdb`              |
++------------------------------+-------------------------------------+-------------------------------------+
 | ``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`                   |
 +------------------------------+-------------------------------------+-------------------------------------+
 | ``intern``                   | :func:`py2:intern`                  | :func:`py3:sys.intern`              |
 +------------------------------+-------------------------------------+-------------------------------------+
 | ``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`              |
+| ``reload_module``            | :func:`py2:reload`                  | :func:`py3:imp.reload`,             |
+|                              |                                     | :func:`py3:importlib.reload`        |
+|                              |                                     | on Python 3.4+                      |
 +------------------------------+-------------------------------------+-------------------------------------+
 | ``reprlib``                  | :mod:`py2:repr`                     | :mod:`py3:reprlib`                  |
 +------------------------------+-------------------------------------+-------------------------------------+
 | ``shlex_quote``              | :mod:`py2:pipes.quote`              | :mod:`py3:shlex.quote`              |
 +------------------------------+-------------------------------------+-------------------------------------+
 | ``socketserver``             | :mod:`py2:SocketServer`             | :mod:`py3:socketserver`             |
 +------------------------------+-------------------------------------+-------------------------------------+
 | ``_thread``                  | :mod:`py2:thread`                   | :mod:`py3:_thread`                  |
 +------------------------------+-------------------------------------+-------------------------------------+
 | ``tkinter``                  | :mod:`py2:Tkinter`                  | :mod:`py3:tkinter`                  |
@@ skipping 207 matching lines @@
    modules in Python 2 and 3.  *old_mod* is the name of the Python 2 module.
    *new_mod* is the name of the Python 3 module.
 
 
 .. class:: MovedAttribute(name, old_mod, new_mod, old_attr=None, new_attr=None)
 
    Create a mapping for :mod:`six.moves` called *name* that references different
    attributes in Python 2 and 3.  *old_mod* is the name of the Python 2 module.
    *new_mod* is the name of the Python 3 module.  If *new_attr* is not given, it
    defaults to *old_attr*.  If neither is given, they both default to *name*.