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
5fae0e58
Commit
5fae0e58
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
9ddfb19e
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
105 additions
and
54 deletions
+105
-54
Doc/c-api/buffer.rst
Doc/c-api/buffer.rst
+7
-5
Doc/library/functions.rst
Doc/library/functions.rst
+42
-29
Doc/library/stdtypes.rst
Doc/library/stdtypes.rst
+15
-10
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 @
5fae0e58
.. 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
...
@@ -10,9 +15,6 @@ Buffer Protocol
...
@@ -10,9 +15,6 @@ Buffer Protocol
.. sectionauthor:: Stefan Krah
.. sectionauthor:: Stefan Krah
.. 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`.
...
@@ -24,8 +26,8 @@ characteristic of being backed by a possibly large memory buffer. It is
...
@@ -24,8 +26,8 @@ characteristic of being backed by a possibly large memory buffer. It is
then desirable, in some situations, to access that buffer directly and
then desirable, 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 @
5fae0e58
...
@@ -534,7 +534,7 @@ are always available. They are listed here in alphabetical order.
...
@@ -534,7 +534,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
...
@@ -1249,37 +1249,50 @@ are always available. They are listed here in alphabetical order.
...
@@ -1249,37 +1249,50 @@ 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)
.. _func-str:
.. _func-str:
.. function:: str(object='')
.. function:: str(object='')
str(object[, encoding[, errors]])
str(object=b'', encoding='utf-8', errors='strict')
Return a :ref:`string <textseq>` version of an object, using one of the
Return a :ref:`string <textseq>` version of *object*. If *object* is not
following modes:
provided, returns the empty string. Otherwise, the behavior of ``str()``
depends on whether *encoding* or *errors* is given, as follows.
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
If neither *encoding* nor *errors* is given, ``str(object)`` returns
the codec for *encoding*. The *encoding* parameter is a string giving
:meth:`object.__str__() <object.__str__>`, which is the "informal" or nicely
the name of an encoding; if the encoding is not known, :exc:`LookupError`
printable string representation of *object*. For string objects, this is
is raised. Error handling is done according to *errors*; this specifies the
the string itself. If *object* does not have a :meth:`~object.__str__`
treatment of characters which are invalid in the input encoding. If
method, then :func:`str` falls back to returning
*errors* is ``'strict'`` (the default), a :exc:`ValueError` is raised on
:meth:`repr(object) <repr>`.
errors, while a value of ``'ignore'`` causes errors to be silently ignored,
and a value of ``'replace'`` causes the official Unicode replacement character,
.. index::
U+FFFD, to be used to replace input characters which cannot be decoded.
single: buffer protocol; str() (built-in function)
See also the :mod:`codecs` module.
single: bytes; str() (built-in function)
When only *object* is given, this returns its nicely printable representation.
If at least one of *encoding* or *errors* is given, *object* should be a
For strings, this is the string itself. The difference with ``repr(object)``
:class:`bytes` or :class:`bytearray` object, or more generally any object
is that ``str(object)`` does not always attempt to return a string that is
that supports the :ref:`buffer protocol <bufferobjects>`. In this case, if
acceptable to :func:`eval`; its goal is to return a printable string.
*object* is a :class:`bytes` (or :class:`bytearray`) object, then
With no arguments, this returns the empty string.
``str(bytes, encoding, errors)`` is equivalent to
:meth:`bytes.decode(encoding, errors) <bytes.decode>`. Otherwise, the bytes
Objects can specify what ``str(object)`` returns by defining a :meth:`__str__`
object underlying the buffer object is obtained before calling
special method.
:meth:`bytes.decode`. See :ref:`binaryseq` and
:ref:`bufferobjects` for information on buffer objects.
For more information on strings and string methods, see the :ref:`textseq`
section. To output formatted strings, see the :ref:`string-formatting`
Passing a :class:`bytes` object to :func:`str` without the *encoding*
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:`textseq` and :ref:`string-methods`
sections. To output formatted strings, see the :ref:`string-formatting`
section. In addition, see the :ref:`stringservices` section.
section. In addition, see the :ref:`stringservices` section.
...
...
Doc/library/stdtypes.rst
View file @
5fae0e58
...
@@ -1346,19 +1346,18 @@ range(2, 1, 3)`` or ``range(0, 3, 2) == range(0, 4, 2)``.)
...
@@ -1346,19 +1346,18 @@ range(2, 1, 3)`` or ``range(0, 3, 2) == range(0, 4, 2)``.)
The :attr:`start`, :attr:`stop` and :attr:`step` attributes.
The :attr:`start`, :attr:`stop` and :attr:`step` attributes.
.. index::
single: string; text sequence type
single: str() (built-in function); (see also string)
object: string
.. _textseq:
.. _textseq:
Text Sequence Type --- :class:`str`
Text Sequence Type --- :class:`str`
===================================
===================================
.. index::
Textual data in Python is handled with :class:`str` objects, or :dfn:`strings`.
object: string
Strings are immutable
object: bytes
object: bytearray
object: io.StringIO
Textual data in Python is handled with ``str`` objects, which are immutable
:ref:`sequences <typesseq>` of Unicode code points. String literals are
:ref:`sequences <typesseq>` of Unicode code points. String literals are
written in a variety of ways:
written in a variety of ways:
...
@@ -1383,6 +1382,9 @@ function :func:`str`.
...
@@ -1383,6 +1382,9 @@ function :func:`str`.
Since there is no separate "character" type, indexing a string produces
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]``.
strings of length 1. That is, for a non-empty string *s*, ``s[0] == s[0:1]``.
.. index::
object: io.StringIO
There is also no mutable string type, but :meth:`str.join` or
There is also no mutable string type, but :meth:`str.join` or
:class:`io.StringIO` can be used to efficiently construct strings from
:class:`io.StringIO` can be used to efficiently construct strings from
multiple fragments.
multiple fragments.
...
@@ -2064,6 +2066,9 @@ that ``'\0'`` is the end of the string.
...
@@ -2064,6 +2066,9 @@ that ``'\0'`` is the end of the string.
longer replaced by ``%g`` conversions.
longer replaced by ``%g`` conversions.
.. index::
single: buffer protocol; binary sequence types
.. _binaryseq:
.. _binaryseq:
Binary Sequence Types --- :class:`bytes`, :class:`bytearray`, :class:`memoryview`
Binary Sequence Types --- :class:`bytes`, :class:`bytearray`, :class:`memoryview`
...
@@ -2077,8 +2082,8 @@ Binary Sequence Types --- :class:`bytes`, :class:`bytearray`, :class:`memoryview
...
@@ -2077,8 +2082,8 @@ Binary Sequence Types --- :class:`bytes`, :class:`bytearray`, :class:`memoryview
The core built-in types for manipulating binary data are :class:`bytes` and
The core built-in types for manipulating binary data are :class:`bytes` and
:class:`bytearray`. They are supported by :class:`memoryview` which uses
:class:`bytearray`. They are supported by :class:`memoryview` which uses
the
buffer protocol to access the memory of other binary objects without
the
:ref:`buffer protocol <bufferobjects>` to access the memory of other
needing to make a copy.
binary objects without
needing to make a copy.
The :mod:`array` module supports efficient storage of basic data types like
The :mod:`array` module supports efficient storage of basic data types like
32-bit integers and IEEE754 double-precision floating values.
32-bit integers and IEEE754 double-precision floating values.
...
...
Doc/reference/datamodel.rst
View file @
5fae0e58
...
@@ -1140,10 +1140,11 @@ Basic customization
...
@@ -1140,10 +1140,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
...
@@ -1157,18 +1158,25 @@ Basic customization
...
@@ -1157,18 +1158,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 @
5fae0e58
...
@@ -1286,6 +1286,7 @@ class BuiltinTest(unittest.TestCase):
...
@@ -1286,6 +1286,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 @
5fae0e58
...
@@ -1182,6 +1182,26 @@ class UnicodeTest(string_tests.CommonTest,
...
@@ -1182,6 +1182,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 @
5fae0e58
...
@@ -283,6 +283,8 @@ Tools/Demos
...
@@ -283,6 +283,8 @@ Tools/Demos
Documentation
Documentation
-------------
-------------
-
Issue
#
13538
:
Improve
str
()
and
object
.
__str__
()
documentation
.
-
Issue
#
16489
:
Make
it
clearer
that
importlib
.
find_loader
()
requires
any
and
-
Issue
#
16489
:
Make
it
clearer
that
importlib
.
find_loader
()
requires
any
and
all
packages
to
be
separately
imported
.
all
packages
to
be
separately
imported
.
...
...
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