diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2013-10-27 10:38:01 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-10-27 10:38:01 (GMT) |
| commit | 8797dcd9d5744b56678777d79ab09ff7c28440ec (patch) | |
| tree | 4f37b5f34869c576baa847c6ef6564e8c71d993b /Lib | |
| parent | d2d6beaa69e6f9699925f9ad8a8630b0c1924c2b (diff) | |
| download | cpython-8797dcd9d5744b56678777d79ab09ff7c28440ec.zip cpython-8797dcd9d5744b56678777d79ab09ff7c28440ec.tar.gz cpython-8797dcd9d5744b56678777d79ab09ff7c28440ec.tar.bz2 | |
Fixed merge test for Tcl/Tk <8.5 (issue #18964).
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_tcl.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py index 2cdac2b..cf1fcf9 100644 --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -277,9 +277,12 @@ class TclTest(unittest.TestCase): (('a', (2, 3.4)), 'a {2 3.4}'), ((), ''), ((call('list', 1, '2', (3.4,)),), '{1 2 3.4}'), - ((call('dict', 'create', 12, '\u20ac', b'\xe2\x82\xac', (3.4,)),), - '{12 € € 3.4}'), ] + if tcl_version >= (8, 5): + testcases += [ + ((call('dict', 'create', 12, '\u20ac', b'\xe2\x82\xac', (3.4,)),), + '{12 € € 3.4}'), + ] for args, res in testcases: self.assertEqual(merge(*args), res, msg=args) self.assertRaises(UnicodeDecodeError, merge, b'\x80') |