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

Tue Oct 13 22:09:57 EDT 2015

https://hg.python.org/cpython/rev/4423e5022378
changeset: 98737:4423e5022378
branch: 3.5
parent: 98733:96645f7cd88c
parent: 98736:4ed0cc2b7c7c
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Tue Oct 13 22:09:19 2015 -0400
summary:
 Merge with 3.4
files:
 Lib/idlelib/configDialog.py | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -1190,7 +1190,7 @@
 This code is generic - it works for any and all IDLE extensions.
 
 IDLE extensions save their configuration options using idleConf.
- This code reads the current configuration using idleConf, supplies a 
+ This code reads the current configuration using idleConf, supplies a
 GUI interface to change the configuration values, and saves the
 changes using idleConf.
 
-- 
Repository URL: https://hg.python.org/cpython
