From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 2 Apr 2015 17:07:09 +0000 (+0300)
Subject: Issue #16840: Fixed test_tcl for Tcl < 8.5.
X-Git-Tag: v3.5.0a4~192^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2379d541dd2a4944713999f0071d53fdddee3d47;p=thirdparty%2FPython%2Fcpython.git

Issue #16840: Fixed test_tcl for Tcl < 8.5.
---

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 3810e12ed062..bf6bd9b6bd69 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -145,7 +145,9 @@ class TclTest(unittest.TestCase):
         tcl = self.interp.tk
         for i in self.get_integers():
             self.assertEqual(tcl.getint(' %d ' % i), i)
-            self.assertEqual(tcl.getint(' %#o ' % i), i)
+            if tcl_version >= (8, 5):
+                self.assertEqual(tcl.getint(' %#o ' % i), i)
+            self.assertEqual(tcl.getint((' %#o ' % i).replace('o', '')), i)
             self.assertEqual(tcl.getint(' %#x ' % i), i)
         if tcl_version < (8, 5):  # bignum was added in Tcl 8.5
             self.assertRaises(TclError, tcl.getint, str(2**1000))
@@ -422,9 +424,7 @@ class TclTest(unittest.TestCase):
                 self.assertEqual(result, str(i))
                 self.assertIsInstance(result, str)
         if tcl_version < (8, 5):  # bignum was added in Tcl 8.5
-            result = tcl.call('expr', str(2**1000))
-            self.assertEqual(result, str(2**1000))
-            self.assertIsInstance(result, str)
+            self.assertRaises(TclError, tcl.call, 'expr', str(2**1000))
 
     def test_passing_values(self):
         def passValue(value):