diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-01-12 07:09:15 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-01-12 07:09:15 (GMT) |
| commit | 2d047e85b71bb8fc02c3f28dd8d8be750d100879 (patch) | |
| tree | 499c96f5504de5dfb4eaf589523dcf3dfbb84615 /Doc | |
| parent | d716c73d0345c4078025c95c8ae4e6ad73af1e14 (diff) | |
| parent | 477a06c14297423181200929974d350ac81d5622 (diff) | |
| download | cpython-2d047e85b71bb8fc02c3f28dd8d8be750d100879.zip cpython-2d047e85b71bb8fc02c3f28dd8d8be750d100879.tar.gz cpython-2d047e85b71bb8fc02c3f28dd8d8be750d100879.tar.bz2 | |
Merge
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/stdtypes.rst | 6 | ||||
| -rw-r--r-- | Doc/tutorial/classes.rst | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 7696ecb..629f08b 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -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 diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst index c3640a0..9f115b0 100644 --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -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 |