Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2015-10-20 02:15:43 -04:00
commit ae94062ae9

View file

@ -1423,4 +1423,4 @@ if __name__ == '__main__':
unittest.main('idlelib.idle_test.test_configdialog', unittest.main('idlelib.idle_test.test_configdialog',
verbosity=2, exit=False) verbosity=2, exit=False)
from idlelib.idle_test.htest import run from idlelib.idle_test.htest import run
run(ConfigDialog, ConfigExtensionsDialog) run(ConfigDialog)