diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2013-11-24 16:26:20 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-11-24 16:26:20 (GMT) |
| commit | 7610ec26931ffc6d273b189443d5529fec3afd0b (patch) | |
| tree | a1eb72cdf01ed11717639d49e80653686357971e /Lib/lib-tk | |
| parent | 40dcf7f0be58261a310ff068e52168762b55c509 (diff) | |
| download | cpython-7610ec26931ffc6d273b189443d5529fec3afd0b.zip cpython-7610ec26931ffc6d273b189443d5529fec3afd0b.tar.gz cpython-7610ec26931ffc6d273b189443d5529fec3afd0b.tar.bz2 | |
Fixed merging error in changeset 3912934e99ba (issue #19733).
Diffstat (limited to 'Lib/lib-tk')
| -rw-r--r-- | Lib/lib-tk/test/test_tkinter/test_widgets.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Lib/lib-tk/test/test_tkinter/test_widgets.py b/Lib/lib-tk/test/test_tkinter/test_widgets.py index 89eaa62..9c5bba8 100644 --- a/Lib/lib-tk/test/test_tkinter/test_widgets.py +++ b/Lib/lib-tk/test/test_tkinter/test_widgets.py @@ -260,13 +260,8 @@ class MenubuttonTest(AbstractLabelTest, unittest.TestCase): test_highlightthickness = StandardOptionsTests.test_highlightthickness.im_func -<<<<<<< -======= - test_highlightthickness = StandardOptionsTests.test_highlightthickness - @unittest.skipIf(sys.platform == 'darwin', 'crashes with Cocoa Tk (issue19733)') ->>>>>>> def test_image(self): widget = self.create() image = Tkinter.PhotoImage('image1') |