diff options
| author | Guido van Rossum <guido@python.org> | 2007-01-14 03:31:43 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-01-14 03:31:43 (GMT) |
| commit | ddefaf31b366ea84250fc5090837c2b764a04102 (patch) | |
| tree | ab3d7b5172f4e6a064165468fc70beb41bdca1d3 /Lib/test/test_builtin.py | |
| parent | 5b787e8bc2dbda5583eee039cb6a6e47c8d8a034 (diff) | |
| download | cpython-ddefaf31b366ea84250fc5090837c2b764a04102.zip cpython-ddefaf31b366ea84250fc5090837c2b764a04102.tar.gz cpython-ddefaf31b366ea84250fc5090837c2b764a04102.tar.bz2 | |
Merged the int/long unification branch, by very crude means (sorry Thomas!).
I banged on the code (beyond what's in that branch) to make fewer tests fail;
the only tests that fail now are:
test_descr -- can't pickle ints?!
test_pickletools -- ???
test_socket -- See python.org/sf/1619659
test_sqlite -- ???
I'll deal with those later.
Diffstat (limited to 'Lib/test/test_builtin.py')
| -rw-r--r-- | Lib/test/test_builtin.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index b001478..fb859d4 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -1081,10 +1081,12 @@ class BuiltinTest(unittest.TestCase): self.assertEqual(long(Foo0()), 42L) self.assertEqual(long(Foo1()), 42L) - self.assertEqual(long(Foo2()), 42L) + # XXX invokes __int__ now + # self.assertEqual(long(Foo2()), 42L) self.assertEqual(long(Foo3()), 0) - self.assertEqual(long(Foo4()), 42) - self.assertRaises(TypeError, long, Foo5()) + # XXX likewise + # self.assertEqual(long(Foo4()), 42) + # self.assertRaises(TypeError, long, Foo5()) def test_map(self): self.assertEqual( |