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

[terry.reedy]

https://hg.python.org/cpython/rev/9c6b12725b7f
changeset:   98810:9c6b12725b7f
branch:      3.5
parent:      98805:d972911effcc
parent:      98809:4bf862fc10a5
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Tue Oct 20 02:15:43 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
@@ -1423,4 +1423,4 @@
     unittest.main('idlelib.idle_test.test_configdialog',
                   verbosity=2, exit=False)
     from idlelib.idle_test.htest import run
-    run(ConfigDialog, ConfigExtensionsDialog)
+    run(ConfigDialog)

-- 
Repository URL: https://hg.python.org/cpython