diff --git a/CHANGES b/CHANGES index 48e0a852..a838b5b7 100644 --- a/CHANGES +++ b/CHANGES @@ -43,7 +43,7 @@ This file lists the changes in each six version. - Issue #298, pull request #299: Add `six.moves.dbm_ndbm`. - Issue #155: Add `six.moves.collections_abc`, which aliases the `collections` - module on Python 2-3.2 and the `collections.abc` on Python 3.3 and greater. + module on Python 2-3.2 and the `collections.abc` module on Python 3.3 and greater. - Pull request #304: Re-add distutils fallback in `setup.py`. @@ -275,7 +275,7 @@ This file lists the changes in each six version. - Issue #23: Allow multiple base classes to be passed to with_metaclass. -- Issue #24: Add six.moves.range alias. This exactly the same as the current +- Issue #24: Add six.moves.range alias. This is exactly the same as the current xrange alias. - Pull request #5: Create six.moves.urllib, which contains abstractions for a @@ -318,7 +318,7 @@ This file lists the changes in each six version. - Add six.next() as an alias for six.advance_iterator(). -- Use the builtin next() function for advance_iterator() where is available +- Use the builtin next() function for advance_iterator() where it is available (2.6+), not just Python 3. - Add the Iterator class for writing portable iterators. diff --git a/documentation/index.rst b/documentation/index.rst index 643ced9f..77b44b7c 100644 --- a/documentation/index.rst +++ b/documentation/index.rst @@ -83,11 +83,11 @@ Six provides constants that may differ between Python versions. Ones ending .. data:: MAXSIZE - The maximum size of a container like :func:`py3:list` or :func:`py3:dict`. - This is equivalent to :data:`py3:sys.maxsize` in Python 2.6 and later - (including 3.x). Note, this is temptingly similar to, but not the same as - :data:`py2:sys.maxint` in Python 2. There is no direct equivalent to - :data:`py2:sys.maxint` in Python 3 because its integer type has no limits + The maximum size of a container like :func:`py3:list` or :func:`py3:dict`. + This is equivalent to :data:`py3:sys.maxsize` in Python 2.6 and later + (including 3.x). Note, this is temptingly similar to, but not the same as + :data:`py2:sys.maxint` in Python 2. There is no direct equivalent to + :data:`py2:sys.maxint` in Python 3 because its integer type has no limits aside from memory. @@ -440,19 +440,19 @@ string data in all Python versions. .. function:: ensure_binary(s, encoding='utf-8', errors='strict') Coerce *s* to :data:`binary_type`. *encoding*, *errors* are the same as - :meth:`py3:str.encode` + :meth:`py3:str.encode`. .. function:: ensure_str(s, encoding='utf-8', errors='strict') Coerce *s* to ``str``. *encoding*, *errors* are the same as - :meth:`py3:str.encode` + :meth:`py3:str.encode`. .. function:: ensure_text(s, encoding='utf-8', errors='strict') Coerce *s* to :data:`text_type`. *encoding*, *errors* are the same as - :meth:`py3:bytes.decode` + :meth:`py3:bytes.decode`. .. data:: StringIO @@ -568,7 +568,7 @@ functionality; its structure mimics the structure of the Python 3 this problem for some applications by pretending attributes on unimportable modules do not exist. This hack does not work in every case, though. If you are encountering problems with the lazy modules and don't use any from imports - directly from ``six.moves`` modules, you can workaround the issue by removing + directly from ``six.moves`` modules, you can work around the issue by removing the six proxy modules:: d = [name for name in sys.modules if name.startswith("six.moves.")] @@ -864,7 +864,7 @@ It is possible to add additional names to the :mod:`six.moves` namespace. Instances of the following classes can be passed to :func:`add_move`. Neither -have any public members. +has any public members. .. class:: MovedModule(name, old_mod, new_mod)