diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-02-06 03:01:24 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-02-06 03:01:24 (GMT) |
| commit | 063ff65e2c305a8f24100475cc4f9ad2bcc342be (patch) | |
| tree | d2bf4831013b53844a40cb8ca865a1be90243edd /Lib/tkinter/test/test_ttk | |
| parent | 7f9876c0daf73b1da3a7bc3ab62add0d1b10706a (diff) | |
| download | cpython-063ff65e2c305a8f24100475cc4f9ad2bcc342be.zip cpython-063ff65e2c305a8f24100475cc4f9ad2bcc342be.tar.gz cpython-063ff65e2c305a8f24100475cc4f9ad2bcc342be.tar.bz2 | |
Merged revisions 69141,69211-69212 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69141 | benjamin.peterson | 2009-01-31 14:01:48 -0600 (Sat, 31 Jan 2009) | 1 line
fix indentation
........
r69211 | guilherme.polo | 2009-02-02 14:23:29 -0600 (Mon, 02 Feb 2009) | 1 line
Restore the previous geometry before leaving the test
........
r69212 | guilherme.polo | 2009-02-02 14:28:59 -0600 (Mon, 02 Feb 2009) | 1 line
Moving to importlib
........
Diffstat (limited to 'Lib/tkinter/test/test_ttk')
| -rw-r--r-- | Lib/tkinter/test/test_ttk/test_extensions.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/tkinter/test/test_ttk/test_extensions.py b/Lib/tkinter/test/test_ttk/test_extensions.py index a14ccca..9e52fc6 100644 --- a/Lib/tkinter/test/test_ttk/test_extensions.py +++ b/Lib/tkinter/test/test_ttk/test_extensions.py @@ -167,14 +167,15 @@ class LabeledScaleTest(unittest.TestCase): x.update() width, height = x.master.winfo_width(), x.master.winfo_height() - width, height = width * 2, height * 2 + width_new, height_new = width * 2, height * 2 x.value = 3 x.update() - x.master.wm_geometry("%dx%d" % (width, height)) + x.master.wm_geometry("%dx%d" % (width_new, height_new)) self.failUnlessEqual(int(x.label.place_info()['x']), x.scale.coords()[0]) + # Reset geometry x.master.wm_geometry("%dx%d" % (width, height)) x.destroy() |