summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-01-10 22:10:56 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-01-10 22:10:56 (GMT)
commitc8935fe8608b5227ccbc944846d2d0468ab3865f (patch)
treec3eecbcf7aa502d9294a6a5d5a6c5920e492b7a4
parent02757ea7e9bd3e3ea7c4cdb3f1c2b7f76fa2b294 (diff)
parente0837a03ee73e7a16c2bffb6e5d2fadfdef8927f (diff)
downloadcpython-c8935fe8608b5227ccbc944846d2d0468ab3865f.zip
cpython-c8935fe8608b5227ccbc944846d2d0468ab3865f.tar.gz
cpython-c8935fe8608b5227ccbc944846d2d0468ab3865f.tar.bz2
Try to fix some ttk tests. Error messages were changed in 8.6b3.
-rw-r--r--Lib/tkinter/test/test_ttk/test_widgets.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py
index 492e7ad..efc3e72 100644
--- a/Lib/tkinter/test/test_ttk/test_widgets.py
+++ b/Lib/tkinter/test/test_ttk/test_widgets.py
@@ -6,7 +6,7 @@ import sys
import tkinter.test.support as support
from tkinter.test.test_ttk.test_functions import MockTclObj
-from tkinter.test.support import tcl_version
+from tkinter.test.support import tcl_version, get_tk_patchlevel
from tkinter.test.widget_tests import (add_standard_options, noconv,
AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests,
setUpModule)
@@ -20,7 +20,7 @@ class StandardTtkOptionsTests(StandardOptionsTests):
widget = self.create()
self.assertEqual(widget['class'], '')
errmsg='attempt to change read-only option'
- if tcl_version < (8, 6):
+ if get_tk_patchlevel() < (8, 6, 0): # actually this was changed in 8.6b3
errmsg='Attempt to change read-only option'
self.checkInvalidParam(widget, 'class', 'Foo', errmsg=errmsg)
widget2 = self.create(class_='Foo')
@@ -576,7 +576,7 @@ class PanedWindowTest(AbstractWidgetTest, unittest.TestCase):
widget = self.create()
self.assertEqual(str(widget['orient']), 'vertical')
errmsg='attempt to change read-only option'
- if tcl_version < (8, 6):
+ if get_tk_patchlevel() < (8, 6, 0): # actually this was changen in 8.6b3
errmsg='Attempt to change read-only option'
self.checkInvalidParam(widget, 'orient', 'horizontal',
errmsg=errmsg)