traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-10-01 15:39:05 -04:00
parent f7b2aa514e 1895f2b544
commit cf4d6997a3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Doc/library/functions.rst
View File

@ -1083,8 +1083,8 @@ are always available. They are listed here in alphabetical order.
.. function:: print(*objects, sep=' ', end='\\n', file=sys.stdout, flush=False) .. function:: print(*objects, sep=' ', end='\\n', file=sys.stdout, flush=False)
Print *objects* to the stream *file*, separated by *sep* and followed by Print *objects* to the text stream *file*, separated by *sep* and followed
*end*. *sep*, *end* and *file*, if present, must be given as keyword by *end*. *sep*, *end* and *file*, if present, must be given as keyword
arguments. arguments.
All non-keyword arguments are converted to strings like :func:`str` does and All non-keyword arguments are converted to strings like :func:`str` does and
@ -1094,9 +1094,12 @@ are always available. They are listed here in alphabetical order.
*end*. *end*.
The *file* argument must be an object with a ``write(string)`` method; if it 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. Whether output is not present or ``None``, :data:`sys.stdout` will be used. Since printed
is buffered is usually determined by *file*, but if the *flush* keyword arguments are converted to text strings, :func:`print` cannot be used with
argument is true, the stream is forcibly flushed. binary mode file objects. For these, use ``file.write(...)`` instead.
Whether output is buffered is usually determined by *file*, but if the
*flush* keyword argument is true, the stream is forcibly flushed.
.. versionchanged:: 3.3 .. versionchanged:: 3.3
Added the *flush* keyword argument. Added the *flush* keyword argument.