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/unicodeobject.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/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index bde3454..fbff31b 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -7585,6 +7585,8 @@ PyObject *PyUnicode_Format(PyObject *format, goto onError; } width = PyInt_AsLong(v); + if (width == -1 && PyErr_Occurred()) + goto onError; if (width < 0) { flags |= F_LJUST; width = -width; @@ -7620,6 +7622,8 @@ PyObject *PyUnicode_Format(PyObject *format, goto onError; } prec = PyInt_AsLong(v); + if (prec == -1 && PyErr_Occurred()) + goto onError; if (prec < 0) prec = 0; if (--fmtcnt >= 0) |