From 462c357d70cf499f82349c6839c624e4f3026a49 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 22 Apr 2015 08:36:03 +0300 Subject: Fixed full Tcl version parsing in tests for pre-final versions. --- Lib/tkinter/test/support.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Lib/tkinter/test/support.py') diff --git a/Lib/tkinter/test/support.py b/Lib/tkinter/test/support.py index 067fc71c8f..52df104003 100644 --- 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 @@ 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 = { -- cgit v1.2.1