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 /Python/bltinmodule.c | |
| 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 'Python/bltinmodule.c')
| -rw-r--r-- | Python/bltinmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 3e6d237..93e6058 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -2124,7 +2124,7 @@ _PyBuiltin_Init(void) SETBUILTIN("float", &PyFloat_Type); SETBUILTIN("frozenset", &PyFrozenSet_Type); SETBUILTIN("property", &PyProperty_Type); - SETBUILTIN("int", &PyInt_Type); + SETBUILTIN("int", &PyLong_Type); SETBUILTIN("list", &PyList_Type); SETBUILTIN("long", &PyLong_Type); SETBUILTIN("object", &PyBaseObject_Type); |