Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
17fc44c9
Commit
17fc44c9
authored
Nov 20, 2012
by
Chris Jerdonek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve str() and object.__str__() documentation (issue #13538).
parent
39bdad81
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
101 additions
and
49 deletions
+101
-49
Doc/c-api/buffer.rst
Doc/c-api/buffer.rst
+7
-5
Doc/library/functions.rst
Doc/library/functions.rst
+44
-31
Doc/library/stdtypes.rst
Doc/library/stdtypes.rst
+9
-3
Doc/reference/datamodel.rst
Doc/reference/datamodel.rst
+18
-10
Lib/test/test_builtin.py
Lib/test/test_builtin.py
+1
-0
Lib/test/test_unicode.py
Lib/test/test_unicode.py
+20
-0
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Doc/c-api/buffer.rst
View file @
17fc44c9
.. highlightlang:: c
.. highlightlang:: c
.. index::
single: buffer protocol
single: buffer interface; (see buffer protocol)
single: buffer object; (see buffer protocol)
.. _bufferobjects:
.. _bufferobjects:
Buffer Protocol
Buffer Protocol
...
@@ -9,9 +14,6 @@ Buffer Protocol
...
@@ -9,9 +14,6 @@ Buffer Protocol
.. sectionauthor:: Benjamin Peterson
.. sectionauthor:: Benjamin Peterson
.. index::
single: buffer interface
Certain objects available in Python wrap access to an underlying memory
Certain objects available in Python wrap access to an underlying memory
array or *buffer*. Such objects include the built-in :class:`bytes` and
array or *buffer*. Such objects include the built-in :class:`bytes` and
:class:`bytearray`, and some extension types like :class:`array.array`.
:class:`bytearray`, and some extension types like :class:`array.array`.
...
@@ -23,8 +25,8 @@ characteristic of being backed by a possibly large memory buffer. It is
...
@@ -23,8 +25,8 @@ characteristic of being backed by a possibly large memory buffer. It is
then desireable, in some situations, to access that buffer directly and
then desireable, in some situations, to access that buffer directly and
without intermediate copying.
without intermediate copying.
Python provides such a facility at the C level in the form of the
*
buffer
Python provides such a facility at the C level in the form of the
:ref:`
buffer
protocol
*
. This protocol has two sides:
protocol
<bufferobjects>`
. This protocol has two sides:
.. index:: single: PyBufferProcs
.. index:: single: PyBufferProcs
...
...
Doc/library/functions.rst
View file @
17fc44c9
...
@@ -528,7 +528,7 @@ are always available. They are listed here in alphabetical order.
...
@@ -528,7 +528,7 @@ are always available. They are listed here in alphabetical order.
is used by most built-in types: :ref:`formatspec`.
is used by most built-in types: :ref:`formatspec`.
The default *format_spec* is an empty string which usually gives the same
The default *format_spec* is an empty string which usually gives the same
effect as calling
``str(value)`
`.
effect as calling
:func:`str(value) <str>
`.
A call to ``format(value, format_spec)`` is translated to
A call to ``format(value, format_spec)`` is translated to
``type(value).__format__(format_spec)`` which bypasses the instance
``type(value).__format__(format_spec)`` which bypasses the instance
...
@@ -1246,38 +1246,51 @@ are always available. They are listed here in alphabetical order.
...
@@ -1246,38 +1246,51 @@ are always available. They are listed here in alphabetical order.
For more information on static methods, consult the documentation on the
For more information on static methods, consult the documentation on the
standard type hierarchy in :ref:`types`.
standard type hierarchy in :ref:`types`.
.. index::
single: string; str() (built-in function)
.. function:: str(object='')
.. function:: str(object='')
str(object[, encoding[, errors]])
str(object=b'', encoding='utf-8', errors='strict')
Return a string version of an object, using one of the following modes:
Return a :ref:`string <typesseq>` version of *object*. If *object* is not
provided, returns the empty string. Otherwise, the behavior of ``str()``
If *encoding* and/or *errors* are given, :func:`str` will decode the
depends on whether *encoding* or *errors* is given, as follows.
*object* which can either be a byte string or a character buffer using
the codec for *encoding*. The *encoding* parameter is a string giving
If neither *encoding* nor *errors* is given, ``str(object)`` returns
the name of an encoding; if the encoding is not known, :exc:`LookupError`
:meth:`object.__str__() <object.__str__>`, which is the "informal" or nicely
is raised. Error handling is done according to *errors*; this specifies the
printable string representation of *object*. For string objects, this is
treatment of characters which are invalid in the input encoding. If
the string itself. If *object* does not have a :meth:`~object.__str__`
*errors* is ``'strict'`` (the default), a :exc:`ValueError` is raised on
method, then :func:`str` falls back to returning
errors, while a value of ``'ignore'`` causes errors to be silently ignored,
:meth:`repr(object) <repr>`.
and a value of ``'replace'`` causes the official Unicode replacement character,
U+FFFD, to be used to replace input characters which cannot be decoded.
.. index::
See also the :mod:`codecs` module.
single: buffer protocol; str() (built-in function)
single: bytes; str() (built-in function)
When only *object* is given, this returns its nicely printable representation.
For strings, this is the string itself. The difference with ``repr(object)``
If at least one of *encoding* or *errors* is given, *object* should be a
is that ``str(object)`` does not always attempt to return a string that is
:class:`bytes` or :class:`bytearray` object, or more generally any object
acceptable to :func:`eval`; its goal is to return a printable string.
that supports the :ref:`buffer protocol <bufferobjects>`. In this case, if
With no arguments, this returns the empty string.
*object* is a :class:`bytes` (or :class:`bytearray`) object, then
``str(bytes, encoding, errors)`` is equivalent to
Objects can specify what ``str(object)`` returns by defining a :meth:`__str__`
:meth:`bytes.decode(encoding, errors) <bytes.decode>`. Otherwise, the bytes
special method.
object underlying the buffer object is obtained before calling
:meth:`bytes.decode`. See the :ref:`typesseq` section, the
For more information on strings see :ref:`typesseq` which describes sequence
:ref:`typememoryview` section, and :ref:`bufferobjects` for information on
functionality (strings are sequences), and also the string-specific methods
buffer objects.
described in the :ref:`string-methods` section. To output formatted strings,
see the :ref:`string-formatting` section. In addition see the
Passing a :class:`bytes` object to :func:`str` without the *encoding*
:ref:`stringservices` section.
or *errors* arguments falls under the first case of returning the informal
string representation (see also the :option:`-b` command-line option to
Python). For example::
>>> str(b'Zoot!')
"b'Zoot!'"
``str`` is a built-in :term:`type`. For more information on the string
type and its methods, see the :ref:`typesseq` and :ref:`string-methods`
sections. To output formatted strings, see the :ref:`string-formatting`
section. In addition, see the :ref:`stringservices` section.
.. function:: sum(iterable[, start])
.. function:: sum(iterable[, start])
...
...
Doc/library/stdtypes.rst
View file @
17fc44c9
...
@@ -794,6 +794,9 @@ More information about generators can be found in :ref:`the documentation for
...
@@ -794,6 +794,9 @@ More information about generators can be found in :ref:`the documentation for
the yield expression <yieldexpr>`.
the yield expression <yieldexpr>`.
.. index::
single: string; sequence types
.. _typesseq:
.. _typesseq:
Sequence Types --- :class:`str`, :class:`bytes`, :class:`bytearray`, :class:`list`, :class:`tuple`, :class:`range`
Sequence Types --- :class:`str`, :class:`bytes`, :class:`bytearray`, :class:`list`, :class:`tuple`, :class:`range`
...
@@ -804,17 +807,20 @@ byte arrays (:class:`bytearray` objects), lists, tuples, and range objects. For
...
@@ -804,17 +807,20 @@ byte arrays (:class:`bytearray` objects), lists, tuples, and range objects. For
other containers see the built in :class:`dict` and :class:`set` classes, and
other containers see the built in :class:`dict` and :class:`set` classes, and
the :mod:`collections` module.
the :mod:`collections` module.
.. index::
.. index::
object: sequence
object: sequence
object: string
object: bytes
object: bytes
object: bytearray
object: bytearray
object: tuple
object: tuple
object: list
object: list
object: range
object: range
object: string
single: string
single: str() (built-in function); (see also string)
Strings contain Unicode characters. Their literals are written in single or
Textual data in Python is handled with :class:`str` objects, or :dfn:`strings`.
Strings are immutable :ref:`sequences <typesseq>` of Unicode code points.
String literals are written in single or
double quotes: ``'xyzzy'``, ``"frobozz"``. See :ref:`strings` for more about
double quotes: ``'xyzzy'``, ``"frobozz"``. See :ref:`strings` for more about
string literals. In addition to the functionality described here, there are
string literals. In addition to the functionality described here, there are
also string-specific methods described in the :ref:`string-methods` section.
also string-specific methods described in the :ref:`string-methods` section.
...
...
Doc/reference/datamodel.rst
View file @
17fc44c9
...
@@ -1124,10 +1124,11 @@ Basic customization
...
@@ -1124,10 +1124,11 @@ Basic customization
modules are still available at the time when the :meth:`__del__` method is
modules are still available at the time when the :meth:`__del__` method is
called.
called.
.. index::
single: repr() (built-in function); __repr__() (object method)
.. method:: object.__repr__(self)
.. index:: builtin: repr
.. method:: object.__repr__(self)
Called by the :func:`repr` built-in function to compute the "official" string
Called by the :func:`repr` built-in function to compute the "official" string
representation of an object. If at all possible, this should look like a
representation of an object. If at all possible, this should look like a
...
@@ -1141,18 +1142,25 @@ Basic customization
...
@@ -1141,18 +1142,25 @@ Basic customization
This is typically used for debugging, so it is important that the representation
This is typically used for debugging, so it is important that the representation
is information-rich and unambiguous.
is information-rich and unambiguous.
.. index::
single: string; __str__() (object method)
single: format() (built-in function); __str__() (object method)
single: print() (built-in function); __str__() (object method)
.. method:: object.__str__(self)
.. method:: object.__str__(self)
.. index::
Called by :func:`str(object) <str>` and the built-in functions
builtin: str
:func:`format` and :func:`print` to compute the "informal" or nicely
builtin: print
printable string representation of an object. The return value must be a
:ref:`string <textseq>` object.
Called by the :func:`str` built-in function and by the :func:`print` function
This method differs from :meth:`object.__repr__` in that there is no
to compute the "informal" string representation of an object. This differs
expectation that :meth:`__str__` return a valid Python expression: a more
from :meth:`__repr__` in that it does not have to be a valid Python
convenient or concise representation can be used.
expression: a more convenient or concise representation may be used instead.
The return value must be a string object.
The default implementation defined by the built-in type :class:`object`
calls :meth:`object.__repr__`.
.. XXX what about subclasses of string?
.. XXX what about subclasses of string?
...
...
Lib/test/test_builtin.py
View file @
17fc44c9
...
@@ -1184,6 +1184,7 @@ class BuiltinTest(unittest.TestCase):
...
@@ -1184,6 +1184,7 @@ class BuiltinTest(unittest.TestCase):
self
.
assertRaises
(
TypeError
,
setattr
,
sys
,
1
,
'spam'
)
self
.
assertRaises
(
TypeError
,
setattr
,
sys
,
1
,
'spam'
)
self
.
assertRaises
(
TypeError
,
setattr
)
self
.
assertRaises
(
TypeError
,
setattr
)
# test_str(): see test_unicode.py and test_bytes.py for str() tests.
def
test_sum
(
self
):
def
test_sum
(
self
):
self
.
assertEqual
(
sum
([]),
0
)
self
.
assertEqual
(
sum
([]),
0
)
...
...
Lib/test/test_unicode.py
View file @
17fc44c9
...
@@ -1100,6 +1100,26 @@ class UnicodeTest(string_tests.CommonTest,
...
@@ -1100,6 +1100,26 @@ class UnicodeTest(string_tests.CommonTest,
self
.
assertRaises
(
TypeError
,
str
,
42
,
42
,
42
)
self
.
assertRaises
(
TypeError
,
str
,
42
,
42
,
42
)
def
test_constructor_keyword_args
(
self
):
"""Pass various keyword argument combinations to the constructor."""
# The object argument can be passed as a keyword.
self
.
assertEqual
(
str
(
object
=
'foo'
),
'foo'
)
self
.
assertEqual
(
str
(
object
=
b'foo'
,
encoding
=
'utf-8'
),
'foo'
)
# The errors argument without encoding triggers "decode" mode.
self
.
assertEqual
(
str
(
b'foo'
,
errors
=
'strict'
),
'foo'
)
# not "b'foo'"
self
.
assertEqual
(
str
(
object
=
b'foo'
,
errors
=
'strict'
),
'foo'
)
def
test_constructor_defaults
(
self
):
"""Check the constructor argument defaults."""
# The object argument defaults to '' or b''.
self
.
assertEqual
(
str
(),
''
)
self
.
assertEqual
(
str
(
errors
=
'strict'
),
''
)
utf8_cent
=
'¢'
.
encode
(
'utf-8'
)
# The encoding argument defaults to utf-8.
self
.
assertEqual
(
str
(
utf8_cent
,
errors
=
'strict'
),
'¢'
)
# The errors argument defaults to strict.
self
.
assertRaises
(
UnicodeDecodeError
,
str
,
utf8_cent
,
encoding
=
'ascii'
)
def
test_codecs_utf7
(
self
):
def
test_codecs_utf7
(
self
):
utfTests
=
[
utfTests
=
[
(
'A
\
u2262
\
u0391
.'
,
b'A+ImIDkQ.'
),
# RFC2152 example
(
'A
\
u2262
\
u0391
.'
,
b'A+ImIDkQ.'
),
# RFC2152 example
...
...
Misc/NEWS
View file @
17fc44c9
...
@@ -731,6 +731,8 @@ Tools/Demos
...
@@ -731,6 +731,8 @@ Tools/Demos
Documentation
Documentation
-------------
-------------
- Issue #13538: Improve str() and object.__str__() documentation.
- Issue #16400: Update the description of which versions of a given package
- Issue #16400: Update the description of which versions of a given package
PyPI displays.
PyPI displays.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment