[Python-checkins] cpython (3.3): Fixed merge test for Tcl/Tk <8.5 (issue #18964).

[serhiy.storchaka]

http://hg.python.org/cpython/rev/5a8aa1102f82
changeset:   86691:5a8aa1102f82
branch:      3.3
parent:      86688:9d6bbd824361
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Oct 27 12:38:01 2013 +0200
summary:
  Fixed merge test for Tcl/Tk <8.5 (issue #18964).

files:
  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
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -277,9 +277,12 @@
                 (('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')

-- 
Repository URL: http://hg.python.org/cpython