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 /Objects/fileobject.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 'Objects/fileobject.c')
| -rw-r--r-- | Objects/fileobject.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Objects/fileobject.c b/Objects/fileobject.c index f2aeb9d..8ebb482 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -2136,7 +2136,7 @@ PyFile_SoftSpace(PyObject *f, int newflag) if (v == NULL) PyErr_Clear(); else { - if (PyInt_Check(v)) + if (PyInt_CheckExact(v)) oldflag = PyInt_AsLong(v); assert(oldflag < INT_MAX); Py_DECREF(v); @@ -2301,6 +2301,8 @@ int PyObject_AsFileDescriptor(PyObject *o) return -1; } + if (fd == -1 && PyErr_Occurred()) + return -1; if (fd < 0) { PyErr_Format(PyExc_ValueError, "file descriptor cannot be a negative integer (%i)", |