From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 27 Oct 2013 10:38:01 +0000 (+0200)
Subject: Fixed merge test for Tcl/Tk <8.5 (issue #18964).
X-Git-Tag: v3.3.3rc2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8797dcd9d5744b56678777d79ab09ff7c28440ec;p=thirdparty%2FPython%2Fcpython.git

Fixed merge test for Tcl/Tk <8.5 (issue #18964).
---

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 2cdac2bd972b..cf1fcf98125c 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')