From f4ec3c5a92faa671d15f80884c40a101495f20ae Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Wed, 11 Jan 2012 03:29:42 -0500 Subject: #13754 String returned if less than *or equal to* x 3 Close *13753 'seq' now 'iterable' --- Doc/library/stdtypes.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index ae0793b..9e08c65 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1189,7 +1189,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. @@ -1197,7 +1197,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() @@ -1266,7 +1266,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) @@ -1414,7 +1414,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)``. -- cgit v0.12 From e247928fedde92e27801887857841f0975915d12 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Wed, 11 Jan 2012 14:09:49 -0500 Subject: Closes #11633 Clarify print buffering. --- Doc/library/functions.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index e5d4a99..ff6d1c0 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -954,7 +954,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) -- cgit v0.12 From ea868d32a1ca25a96a1dc17ca1c11db0bf37e413 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Wed, 11 Jan 2012 14:54:34 -0500 Subject: Minor correction. #11418 --- Doc/tutorial/classes.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst index 6ee2e94..68c4e5d 100644 --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -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 -- cgit v0.12