traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed merging error in changeset 3912934e99ba (issue #19733).

This commit is contained in:
Serhiy Storchaka 2013-11-24 18:26:20 +02:00
parent 40dcf7f0be
commit 7610ec2693
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/lib-tk/test/test_tkinter/test_widgets.py
View File

@ -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')