cpython: de8787029fe4 (original) (raw)

Mercurial > cpython

changeset 79702:de8787029fe4 3.3

merge heads

Benjamin Peterson benjamin@python.org
date	Fri, 12 Oct 2012 12:05:01 -0400
parents	d4ab5859721e(current diff)0cddf0bd19f8(diff)
children	6e721c72683f 95f7481fc9f1
files	Doc/howto/functional.rst Doc/library/exceptions.rst Doc/library/functions.rst Doc/library/stdtypes.rst Doc/reference/datamodel.rst Misc/NEWS
diffstat	6 files changed, 11 insertions(+), 9 deletions(-)[+] [-] 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

line wrap: on

line diff

--- 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.

--- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -275,8 +275,8 @@ The following exceptions are the excepti .. 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

--- 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 va 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].

--- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -10,7 +10,7 @@ .. seealso::

:ref:typesseq

:ref:textseq :ref:string-methods

--- a/Doc/tutorial/introduction.rst +++ b/Doc/tutorial/introduction.rst @@ -390,7 +390,7 @@ The built-in function :func:len return .. seealso::

:ref:typesseq

:ref:textseq Strings are examples of sequence types, and support the common operations supported by such types.

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -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.