On Fri, Oct 12, 2012 at 9:05 AM, benjamin.peterson
<python-check...@python.org> wrote:
> http://hg.python.org/cpython/rev/de8787029fe4
> changeset: 79702:de8787029fe4
> branch: 3.3
> parent: 79701:d4ab5859721e
> parent: 79690:0cddf0bd19f8
It looks like this 3.3 check-in also reverted previous valid work.
The following command shows the diff from the "mainline", which isn't
visible in the e-mail contents below:
hg diff -r 0cddf0bd19f8 -r de8787029fe4
It's hard for me to piece together exactly what happened, or else I
would try to fix it myself.
--Chris
> user: Benjamin Peterson <benja...@python.org>
> date: Fri Oct 12 12:05:01 2012 -0400
> summary:
> merge heads
>
> files:
> Doc/howto/unicode.rst | 2 +-
> Doc/library/exceptions.rst | 4 ++--
> Doc/library/stdtypes.rst | 8 ++++----
> Doc/library/string.rst | 2 +-
> Doc/tutorial/introduction.rst | 2 +-
> Misc/NEWS | 2 ++
> 6 files changed, 11 insertions(+), 9 deletions(-)
>
>
> diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
> --- a/Doc/howto/unicode.rst
> +++ b/Doc/howto/unicode.rst
> @@ -414,7 +414,7 @@
> ----------
>
> The ``str`` type is described in the Python library reference at
> -:ref:`typesseq`.
> +:ref:`textseq`.
>
> The documentation for the :mod:`unicodedata` module.
>
> diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
> --- a/Doc/library/exceptions.rst
> +++ b/Doc/library/exceptions.rst
> @@ -275,8 +275,8 @@
> .. exception:: StopIteration
>
> Raised by built-in function :func:`next` and an :term:`iterator`\'s
> - :meth:`__next__` method to signal that there are no further items to be
> - produced by the iterator.
> + :meth:`~iterator.__next__` method to signal that there are no further
> + items produced by the iterator.
>
> The exception object has a single attribute :attr:`value`, which is
> given as an argument when constructing the exception, and defaults
> diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
> --- a/Doc/library/stdtypes.rst
> +++ b/Doc/library/stdtypes.rst
> @@ -1358,8 +1358,8 @@
> object: io.StringIO
>
>
> -Textual data in Python is handled with :class:`str` objects, which are
> -immutable sequences of Unicode code points. String literals are
> +Textual data in Python is handled with ``str`` objects, which are immutable
> +:ref:`sequences <typesseq>` of Unicode code points. String literals are
> written in a variety of ways:
>
> * Single quotes: ``'allows embedded "double" quotes'``
> @@ -1377,8 +1377,8 @@
> including supported escape sequences, and the ``r`` ("raw") prefix that
> disables most escape sequence processing.
>
> -Strings may also be created from other objects with the :ref:`str <func-str>`
> -built-in.
> +Strings may also be created from other objects with the built-in
> +function :func:`str`.
>
> Since there is no separate "character" type, indexing a string produces
> strings of length 1. That is, for a non-empty string *s*, ``s[0] == s[0:1]``.
> diff --git a/Doc/library/string.rst b/Doc/library/string.rst
> --- a/Doc/library/string.rst
> +++ b/Doc/library/string.rst
> @@ -10,7 +10,7 @@
>
> .. seealso::
>
> - :ref:`typesseq`
> + :ref:`textseq`
>
> :ref:`string-methods`
>
> diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
> --- a/Doc/tutorial/introduction.rst
> +++ b/Doc/tutorial/introduction.rst
> @@ -390,7 +390,7 @@
>
> .. seealso::
>
> - :ref:`typesseq`
> + :ref:`textseq`
> Strings are examples of *sequence types*, and support the common
> operations supported by such types.
>
> diff --git a/Misc/NEWS b/Misc/NEWS
> --- a/Misc/NEWS
> +++ b/Misc/NEWS
> @@ -41,6 +41,8 @@
> Library
> -------
>
> +- Issue #16176: Properly identify Windows 8 via platform.platform()
> +
> - Issue #16114: The subprocess module no longer provides a misleading error
> message stating that args[0] did not exist when either the cwd or
> executable
> keyword arguments specified a path that did not exist.
>
> --
> Repository URL: http://hg.python.org/cpython
>
> _______________________________________________
> Python-checkins mailing list
> python-check...@python.org
> http://mail.python.org/mailman/listinfo/python-checkins
>
_______________________________________________
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe:
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
