[Python-checkins] cpython (merge 3.5 -> 3.6): Merge from 3.5
berker.peksag
python-checkins at python.org
Tue Dec 27 07:07:57 EST 2016
https://hg.python.org/cpython/rev/af71708d7445
changeset: 105843:af71708d7445
branch: 3.6
parent: 105840:cb864fc4b3be
parent: 105842:89d59916cb2c
user: Berker Peksag <berker.peksag at gmail.com>
date: Tue Dec 27 15:09:35 2016 +0300
summary:
Merge from 3.5
files:
Doc/library/shutil.rst | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -625,8 +625,6 @@
Querying the size of the output terminal
----------------------------------------
-.. versionadded:: 3.3
-
.. function:: get_terminal_size(fallback=(columns, lines))
Get the size of the terminal window.
@@ -650,6 +648,8 @@
See also: The Single UNIX Specification, Version 2,
`Other Environment Variables`_.
+ .. versionadded:: 3.3
+
.. _`Other Environment Variables`:
http://pubs.opengroup.org/onlinepubs/7908799/xbd/envvar.html#tag_002_003
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list