diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-10-12 16:05:01 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-10-12 16:05:01 (GMT) |
| commit | b548d49f655311835b72e0a27e51d5b73e671c82 (patch) | |
| tree | d1fb51b1a02859d322e668b1770fcf268c7cbdbf | |
| parent | 143d034ecd110f8543eba4ad76dfb6085cdaeb3d (diff) | |
| parent | 1dd7c304194572c3c5e6fd943bc0aac49a4c481c (diff) | |
| download | cpython-b548d49f655311835b72e0a27e51d5b73e671c82.zip cpython-b548d49f655311835b72e0a27e51d5b73e671c82.tar.gz cpython-b548d49f655311835b72e0a27e51d5b73e671c82.tar.bz2 | |
merge heads
| -rw-r--r-- | Doc/howto/unicode.rst | 2 | ||||
| -rw-r--r-- | Doc/library/exceptions.rst | 4 | ||||
| -rw-r--r-- | Doc/library/stdtypes.rst | 8 | ||||
| -rw-r--r-- | Doc/library/string.rst | 2 | ||||
| -rw-r--r-- | Doc/tutorial/introduction.rst | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
6 files changed, 11 insertions, 9 deletions
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst index f9eeae4..5d9e027 100644 --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -414,7 +414,7 @@ References ---------- 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 index 6ba58d4..ac02215 100644 --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -275,8 +275,8 @@ The following exceptions are the exceptions that are usually raised. .. 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 index 557c433..e45dd30 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1358,8 +1358,8 @@ Text Sequence Type --- :class:`str` 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 @@ See :ref:`strings` for more about the various forms of string literal, 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 index 79d4e3f..9c63272 100644 --- 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 index b6d94ac..c07a668 100644 --- a/Doc/tutorial/introduction.rst +++ b/Doc/tutorial/introduction.rst @@ -390,7 +390,7 @@ The built-in function :func:`len` returns the length of a string:: .. seealso:: - :ref:`typesseq` + :ref:`textseq` Strings are examples of *sequence types*, and support the common operations supported by such types. @@ -41,6 +41,8 @@ Core and Builtins 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. |