[Python-checkins] cpython (merge 3.3 -> default): Try to fix some ttk tests. Error messages were changed in 8.6b3.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/a7aa5a8c1c37
changeset:   88404:a7aa5a8c1c37
parent:      88401:8a41abdb190a
parent:      88403:e00fc830937c
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sat Jan 11 00:10:56 2014 +0200
summary:
  Try to fix some ttk tests.  Error messages were changed in 8.6b3.

files:
  Lib/tkinter/test/test_ttk/test_widgets.py |  6 +++---
  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
--- a/Lib/tkinter/test/test_ttk/test_widgets.py
+++ b/Lib/tkinter/test/test_ttk/test_widgets.py
@@ -6,7 +6,7 @@
 
 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 @@
         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 @@
         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)

-- 
Repository URL: http://hg.python.org/cpython