mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 05:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge

Browse source
This commit is contained in:
Antoine Pitrou 2012-01-12 08:09:15 +01:00
commit 2d047e85b7
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Doc/library/stdtypes.rst
View file

@ -1049,7 +1049,7 @@ string 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)``.
.. versionchanged:: 2.4
Support for the *fillchar* argument.
@ -1113,7 +1113,7 @@ string 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)``.
.. versionchanged:: 2.4
Support for the *fillchar* argument.
@ -1293,7 +1293,7 @@ string 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)``.
.. versionadded:: 2.2.2

4
Doc/tutorial/classes.rst
View file

@ -409,8 +409,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