Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge from 3.3: Add and adjust some string-related links in the docs.

This commit is contained in:
Chris Jerdonek 2012-10-11 18:59:34 -07:00
parent 23354f505e c33899bd71
commit e312f4d304
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Doc/library/functions.rst
View File

@ -1206,7 +1206,8 @@ are always available. They are listed here in alphabetical order.
.. function:: str(object='')
str(object[, encoding[, errors]])
Return a string version of an object, using one of the following modes:
Return a :ref:`string <textseq>` version of an object, using one of the
following modes:
If *encoding* and/or *errors* are given, :func:`str` will decode the
*object* which can either be a byte string or a character buffer using
@ -1229,11 +1230,9 @@ are always available. They are listed here in alphabetical order.
Objects can specify what ``str(object)`` returns by defining a :meth:`__str__`
special method.
For more information on strings see :ref:`typesseq` which describes sequence
functionality (strings are sequences), and also the string-specific methods
described in the :ref:`string-methods` section. To output formatted strings,
see the :ref:`string-formatting` section. In addition see the
:ref:`stringservices` section.
For more information on strings and string methods, see the :ref:`textseq`
section. To output formatted strings, see the :ref:`string-formatting`
section. In addition, see the :ref:`stringservices` section.
.. function:: sum(iterable[, start])

8
Doc/library/stdtypes.rst
View File

@ -1357,8 +1357,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'``
@ -1376,8 +1376,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]``.