(original) (raw)

changeset: 79702:de8787029fe4 branch: 3.3 parent: 79701:d4ab5859721e parent: 79690:0cddf0bd19f8 user: Benjamin Peterson benjamin@python.org date: Fri Oct 12 12:05:01 2012 -0400 files: Doc/howto/functional.rst Doc/library/exceptions.rst Doc/library/functions.rst Doc/library/stdtypes.rst Doc/reference/datamodel.rst Misc/NEWS description: merge heads diff -r d4ab5859721e -r de8787029fe4 Doc/howto/unicode.rst --- a/Doc/howto/unicode.rst Fri Oct 12 12:04:32 2012 -0400 +++ b/Doc/howto/unicode.rst Fri Oct 12 12:05:01 2012 -0400 @@ -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 -r d4ab5859721e -r de8787029fe4 Doc/library/exceptions.rst --- a/Doc/library/exceptions.rst Fri Oct 12 12:04:32 2012 -0400 +++ b/Doc/library/exceptions.rst Fri Oct 12 12:05:01 2012 -0400 @@ -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 -r d4ab5859721e -r de8787029fe4 Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst Fri Oct 12 12:04:32 2012 -0400 +++ b/Doc/library/stdtypes.rst Fri Oct 12 12:05:01 2012 -0400 @@ -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 ` 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 ` -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 -r d4ab5859721e -r de8787029fe4 Doc/library/string.rst --- a/Doc/library/string.rst Fri Oct 12 12:04:32 2012 -0400 +++ b/Doc/library/string.rst Fri Oct 12 12:05:01 2012 -0400 @@ -10,7 +10,7 @@ .. seealso:: - :ref:`typesseq` + :ref:`textseq` :ref:`string-methods` diff -r d4ab5859721e -r de8787029fe4 Doc/tutorial/introduction.rst --- a/Doc/tutorial/introduction.rst Fri Oct 12 12:04:32 2012 -0400 +++ b/Doc/tutorial/introduction.rst Fri Oct 12 12:05:01 2012 -0400 @@ -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 -r d4ab5859721e -r de8787029fe4 Misc/NEWS --- a/Misc/NEWS Fri Oct 12 12:04:32 2012 -0400 +++ b/Misc/NEWS Fri Oct 12 12:05:01 2012 -0400 @@ -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./benjamin@python.org