From e0837a03ee73e7a16c2bffb6e5d2fadfdef8927f Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sat, 11 Jan 2014 00:10:04 +0200 Subject: [PATCH] Try to fix some ttk tests. Error messages were changed in 8.6b3. --- Lib/tkinter/test/test_ttk/test_widgets.py | 6 +++--- 1 file 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 492e7ad8cb1..efc3e725c67 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)