[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4
terry.reedy
python-checkins at python.org
Tue Jul 15 05:08:36 CEST 2014
http://hg.python.org/cpython/rev/ddfcaeb1c56b
changeset: 91685:ddfcaeb1c56b
parent: 91682:41c8fc189671
parent: 91684:681979c6e6b2
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Mon Jul 14 23:07:47 2014 -0400
summary:
Merge with 3.4
files:
Lib/idlelib/configDialog.py | 14 +++-
Lib/idlelib/idle_test/test_configdialog.py | 32 ++++++++++
2 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -24,9 +24,10 @@
class ConfigDialog(Toplevel):
- def __init__(self,parent,title,_htest=False):
+ def __init__(self, parent, title, _htest=False, _utest=False):
"""
_htest - bool, change box location when running htest
+ _utest - bool, don't wait_window when running unittest
"""
Toplevel.__init__(self, parent)
self.wm_withdraw()
@@ -69,8 +70,9 @@
self.LoadConfigs()
self.AttachVarCallbacks() #avoid callbacks during LoadConfigs
- self.wm_deiconify()
- self.wait_window()
+ if not _utest:
+ self.wm_deiconify()
+ self.wait_window()
def CreateWidgets(self):
self.tabPages = TabbedPageSet(self,
@@ -678,7 +680,7 @@
if self.listBindings.curselection():
reselect=1
listIndex=self.listBindings.index(ANCHOR)
- # keySet=idleConf.GetKeySet(keySetName) # unused, delete?
+ keySet=idleConf.GetKeySet(keySetName)
bindNames = list(keySet.keys())
bindNames.sort()
self.listBindings.delete(0,END)
@@ -1144,5 +1146,9 @@
pass
if __name__ == '__main__':
+ import unittest
+ unittest.main('idlelib.idle_test.test_configdialog',
+ verbosity=2, exit=False)
+
from idlelib.idle_test.htest import run
run(ConfigDialog)
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
new file mode 100644
--- /dev/null
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -0,0 +1,32 @@
+'''Unittests for idlelib/configHandler.py
+
+Coverage: 46% just by creating dialog. The other half is change code.
+
+'''
+import unittest
+from test.support import requires
+from tkinter import Tk
+from idlelib.configDialog import ConfigDialog
+from idlelib.macosxSupport import _initializeTkVariantTests
+
+
+class ConfigDialogTest(unittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ requires('gui')
+ cls.root = Tk()
+ _initializeTkVariantTests(cls.root)
+
+ @classmethod
+ def tearDownClass(cls):
+ cls.root.destroy()
+ del cls.root
+
+ def test_dialog(self):
+ d=ConfigDialog(self.root, 'Test', _utest=True)
+ d.destroy()
+
+
+if __name__ == '__main__':
+ unittest.main(verbosity=2)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list