]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #22665: Add missing get_terminal_size and SameFileError to shutil.__all__.
authorBerker Peksag <berker.peksag@gmail.com>
Sat, 1 Nov 2014 09:05:36 +0000 (11:05 +0200)
committerBerker Peksag <berker.peksag@gmail.com>
Sat, 1 Nov 2014 09:05:36 +0000 (11:05 +0200)
1  2 
Lib/shutil.py
Lib/test/test_shutil.py
Misc/NEWS

diff --cc Lib/shutil.py
Simple merge
Simple merge
diff --cc Misc/NEWS
index 95363fb8313f314a3f642186ebbb69e7dd058a1b,9f9155dcf1cff6e69825d80420431224701c19a3..be34a2e99f118eb88c76b54c591968c7182a5f50
+++ b/Misc/NEWS
@@@ -180,9 -33,9 +180,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #22665: Add missing get_terminal_size and SameFileError to
+   shutil.__all__.
 +- Issue #6623: Remove deprecated Netrc class in the ftplib module. Patch by
 +  Matt Chaput.
 +
  - Issue #17381: Fixed handling of case-insensitive ranges in regular
    expressions.