[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

Sat Jun 4 02:32:49 EDT 2016

https://hg.python.org/cpython/rev/042c19239da6
changeset: 101692:042c19239da6
parent: 101689:38c8599a1623
parent: 101691:b826a259a51b
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sat Jun 04 02:32:32 2016 -0400
summary:
 Merge with 3.5
files:
 Lib/idlelib/idle_test/README.txt | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/idlelib/idle_test/README.txt b/Lib/idlelib/idle_test/README.txt
--- a/Lib/idlelib/idle_test/README.txt
+++ b/Lib/idlelib/idle_test/README.txt
@@ -56,7 +56,7 @@
 
 To guard a test class, put "requires('gui')" in its setUpClass function.
 
-To avoid interfering with other gui tests, all gui objects must be destroyed and
+To avoid interfering with other GUI tests, all GUI objects must be destroyed and
 deleted by the end of the test. The Tk root created in a setUpX function should
 be destroyed in the corresponding tearDownX and the module or class attribute
 deleted. Others widgets should descend from the single root and the attributes
@@ -116,7 +116,7 @@
 option is needed in xyx.py files when an htest follows.
 
 The following command lines also run all test methods, including
-gui tests, in test_xyz.py. (Both '-m idlelib' and '-m idlelib.idle'
+GUI tests, in test_xyz.py. (Both '-m idlelib' and '-m idlelib.idle'
 start Idle and so cannot run tests.)
 
 python -m idlelib.xyz
-- 
Repository URL: https://hg.python.org/cpython
