Fixed full Tcl version parsing in tests for pre-final versions.
This commit is contained in:
parent
333518e01d
commit
462c357d70
|
@ -1,4 +1,5 @@
|
|||
import unittest
|
||||
import re
|
||||
import sys
|
||||
import os
|
||||
from test import support
|
||||
|
@ -17,27 +18,22 @@ try:
|
|||
except ImportError:
|
||||
INT_MAX = PY_SSIZE_T_MAX = sys.maxsize
|
||||
|
||||
tcl_version = _tkinter.TCL_VERSION.split('.')
|
||||
try:
|
||||
for i in range(len(tcl_version)):
|
||||
tcl_version[i] = int(tcl_version[i])
|
||||
except ValueError:
|
||||
pass
|
||||
tcl_version = tuple(tcl_version)
|
||||
tcl_version = tuple(map(int, _tkinter.TCL_VERSION.split('.')))
|
||||
|
||||
_tk_patchlevel = None
|
||||
def get_tk_patchlevel():
|
||||
global _tk_patchlevel
|
||||
if _tk_patchlevel is None:
|
||||
tcl = Tcl()
|
||||
patchlevel = []
|
||||
for x in tcl.call('info', 'patchlevel').split('.'):
|
||||
try:
|
||||
x = int(x, 10)
|
||||
except ValueError:
|
||||
x = -1
|
||||
patchlevel.append(x)
|
||||
_tk_patchlevel = tuple(patchlevel)
|
||||
patchlevel = tcl.call('info', 'patchlevel')
|
||||
m = re.fullmatch(r'(\d+)\.(\d+)([ab.])(\d+)', patchlevel)
|
||||
major, minor, releaselevel, serial = m.groups()
|
||||
major, minor, serial = int(major), int(minor), int(serial)
|
||||
releaselevel = {'a': 'alpha', 'b': 'beta', '.': 'final'}[releaselevel]
|
||||
if releaselevel == 'final':
|
||||
_tk_patchlevel = major, minor, serial, releaselevel, 0
|
||||
else:
|
||||
_tk_patchlevel = major, minor, 0, releaselevel, serial
|
||||
return _tk_patchlevel
|
||||
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
import sys
|
||||
import re
|
||||
import tkinter
|
||||
import unittest
|
||||
from test.support import requires
|
||||
|
||||
class AbstractTkTest:
|
||||
|
||||
|
@ -63,14 +62,15 @@ def get_tk_patchlevel():
|
|||
global _tk_patchlevel
|
||||
if _tk_patchlevel is None:
|
||||
tcl = tkinter.Tcl()
|
||||
patchlevel = []
|
||||
for x in tcl.call('info', 'patchlevel').split('.'):
|
||||
try:
|
||||
x = int(x, 10)
|
||||
except ValueError:
|
||||
x = -1
|
||||
patchlevel.append(x)
|
||||
_tk_patchlevel = tuple(patchlevel)
|
||||
patchlevel = tcl.call('info', 'patchlevel')
|
||||
m = re.fullmatch(r'(\d+)\.(\d+)([ab.])(\d+)', patchlevel)
|
||||
major, minor, releaselevel, serial = m.groups()
|
||||
major, minor, serial = int(major), int(minor), int(serial)
|
||||
releaselevel = {'a': 'alpha', 'b': 'beta', '.': 'final'}[releaselevel]
|
||||
if releaselevel == 'final':
|
||||
_tk_patchlevel = major, minor, serial, releaselevel, 0
|
||||
else:
|
||||
_tk_patchlevel = major, minor, 0, releaselevel, serial
|
||||
return _tk_patchlevel
|
||||
|
||||
units = {
|
||||
|
|
|
@ -20,7 +20,7 @@ class StandardTtkOptionsTests(StandardOptionsTests):
|
|||
widget = self.create()
|
||||
self.assertEqual(widget['class'], '')
|
||||
errmsg='attempt to change read-only option'
|
||||
if get_tk_patchlevel() < (8, 6, 0): # actually this was changed in 8.6b3
|
||||
if get_tk_patchlevel() < (8, 6, 0, 'beta', 3):
|
||||
errmsg='Attempt to change read-only option'
|
||||
self.checkInvalidParam(widget, 'class', 'Foo', errmsg=errmsg)
|
||||
widget2 = self.create(class_='Foo')
|
||||
|
@ -551,7 +551,7 @@ class PanedWindowTest(AbstractWidgetTest, unittest.TestCase):
|
|||
widget = self.create()
|
||||
self.assertEqual(str(widget['orient']), 'vertical')
|
||||
errmsg='attempt to change read-only option'
|
||||
if get_tk_patchlevel() < (8, 6, 0): # actually this was changed in 8.6b3
|
||||
if get_tk_patchlevel() < (8, 6, 0, 'beta', 3):
|
||||
errmsg='Attempt to change read-only option'
|
||||
self.checkInvalidParam(widget, 'orient', 'horizontal',
|
||||
errmsg=errmsg)
|
||||
|
|
Loading…
Reference in New Issue