mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

merge heads

Browse source
This commit is contained in:
Benjamin Peterson 2012-01-11 18:17:40 -05:00
commit 22ef4fa7e9
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/library/functions.rst
View file

@ -959,7 +959,9 @@ are always available. They are listed here in alphabetical order.
*end*.
The *file* argument must be an object with a ``write(string)`` method; if it
is not present or ``None``, :data:`sys.stdout` will be used.
is not present or ``None``, :data:`sys.stdout` will be used. Output buffering
is determined by *file*. Use ``sys.stdout.flush()`` to ensure immediate
appearance on a screen.
.. function:: property(fget=None, fset=None, fdel=None, doc=None)

8
Doc/library/stdtypes.rst
View file

@ -1193,7 +1193,7 @@ functions based on regular expressions.
Return a string which is the concatenation of the strings in the
:term:`iterable` *iterable*. A :exc:`TypeError` will be raised if there are
any non-string values in *seq*, including :class:`bytes` objects. The
any non-string values in *iterable*, including :class:`bytes` objects. The
separator between elements is the string providing this method.
@ -1201,7 +1201,7 @@ functions based on regular expressions.
Return the string left justified in a string of length *width*. Padding is done
using the specified *fillchar* (default is a space). The original string is
returned if *width* is less than ``len(s)``.
returned if *width* is less than or equal to ``len(s)``.
.. method:: str.lower()
@ -1270,7 +1270,7 @@ functions based on regular expressions.
Return the string right justified in a string of length *width*. Padding is done
using the specified *fillchar* (default is a space). The original string is
returned if *width* is less than ``len(s)``.
returned if *width* is less than or equal to ``len(s)``.
.. method:: str.rpartition(sep)
@ -1419,7 +1419,7 @@ functions based on regular expressions.
Return the numeric string left filled with zeros in a string of length
*width*. A sign prefix is handled correctly. The original string is
returned if *width* is less than ``len(s)``.
returned if *width* is less than or equal to ``len(s)``.

4
Doc/tutorial/classes.rst
View file

@ -458,8 +458,8 @@ argument::
self.add(x)
Methods may reference global names in the same way as ordinary functions. The
global scope associated with a method is the module containing the class
definition. (The class itself is never used as a global scope.) While one
global scope associated with a method is the module containing its
definition. (A class is never used as a global scope.) While one
rarely encounters a good reason for using global data in a method, there are
many legitimate uses of the global scope: for one thing, functions and modules
imported into the global scope can be used by methods, as well as functions and