[Python-checkins] cpython (3.4): Fixed full Tcl version parsing in tests for pre-final versions.

Wed Apr 22 10:02:31 CEST 2015

https://hg.python.org/cpython/rev/5bf0d9086cfc
changeset: 95760:5bf0d9086cfc
branch: 3.4
parent: 95756:e0e3d2ec56b6
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed Apr 22 08:36:03 2015 +0300
summary:
 Fixed full Tcl version parsing in tests for pre-final versions.
files:
 Lib/test/test_tcl.py | 26 ++++------
 Lib/tkinter/test/support.py | 20 ++++----
 Lib/tkinter/test/test_ttk/test_widgets.py | 4 +-
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -1,4 +1,5 @@
 import unittest
+import re
 import sys
 import os
 from test import support
@@ -17,27 +18,22 @@
 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
 
 
diff --git a/Lib/tkinter/test/support.py b/Lib/tkinter/test/support.py
--- a/Lib/tkinter/test/support.py
+++ b/Lib/tkinter/test/support.py
@@ -1,7 +1,6 @@
-import sys
+import re
 import tkinter
 import unittest
-from test.support import requires
 
 class AbstractTkTest:
 
@@ -63,14 +62,15 @@
 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 = {
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
@@ -20,7 +20,7 @@
 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 @@
 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)
-- 
Repository URL: https://hg.python.org/cpython
