From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 4 Jun 2016 19:55:53 +0000 (-0400)
Subject: Merge: Revise and synchronize idle_test.test_configdialog.
X-Git-Tag: v3.6.0a2~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55de5c3de39a770c1de423f3fb5c34183a053316;p=thirdparty%2FPython%2Fcpython.git

Merge: Revise and synchronize idle_test.test_configdialog.
---

55de5c3de39a770c1de423f3fb5c34183a053316
diff --cc Lib/idlelib/idle_test/test_configdialog.py
index e4e1a319f7a8,b063601b2709..4f5d216af847
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@@ -1,13 -1,14 +1,14 @@@
 -'''Test idlelib.configDialog.
 +'''Test idlelib.configdialog.
  
- Coverage: 46% just by creating dialog. The other half is change code.
+ Coverage: 46% just by creating dialog.
+ The other half is code for working with user customizations.
  '''
- import unittest
 -from idlelib.configDialog import ConfigDialog  # always test import
++from idlelib.configdialog import ConfigDialog  # always test import
  from test.support import requires
+ requires('gui')
  from tkinter import Tk
- from idlelib.configdialog import ConfigDialog
- from idlelib.macosx import _initializeTkVariantTests
- 
+ import unittest
 -from idlelib import macosxSupport as macosx
++from idlelib import macosx
  
  class ConfigDialogTest(unittest.TestCase):