changeset: 95396:1d2444273b3d branch: 3.4 parent: 95393:3b8039c37b37 user: Serhiy Storchaka date: Thu Apr 02 20:07:09 2015 +0300 files: Lib/test/test_tcl.py description: Issue #16840: Fixed test_tcl for Tcl < 8.5. diff -r 3b8039c37b37 -r 1d2444273b3d Lib/test/test_tcl.py --- a/Lib/test/test_tcl.py Thu Apr 02 19:57:52 2015 +0300 +++ b/Lib/test/test_tcl.py Thu Apr 02 20:07:09 2015 +0300 @@ -145,7 +145,9 @@ 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 @@ 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):