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 /Modules/_struct.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 'Modules/_struct.c')
| -rw-r--r-- | Modules/_struct.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Modules/_struct.c b/Modules/_struct.c index 8d0a3bc..518a57e 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -118,8 +118,6 @@ get_pylong(PyObject *v) PyNumberMethods *m; assert(v != NULL); - if (PyInt_Check(v)) - return PyLong_FromLong(PyInt_AS_LONG(v)); if (PyLong_Check(v)) { Py_INCREF(v); return v; |