diff options
| author | Tim Peters <tim.peters@gmail.com> | 2000-11-30 05:22:44 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2000-11-30 05:22:44 (GMT) |
| commit | a3a3a030af8579bdd0d3a8d293ee60a1ec8107dc (patch) | |
| tree | 49d4db03e89d032c9ae7d8a606574392c34aed9b /Objects | |
| parent | 469d5bb0b4ca8008f271c4425236292b8a55afd6 (diff) | |
| download | cpython-a3a3a030af8579bdd0d3a8d293ee60a1ec8107dc.zip cpython-a3a3a030af8579bdd0d3a8d293ee60a1ec8107dc.tar.gz cpython-a3a3a030af8579bdd0d3a8d293ee60a1ec8107dc.tar.bz2 | |
Fox for SF bug #123859: %[duxXo] long formats inconsistent.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/stringobject.c | 5 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 31d1b05..47da4ed 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -2897,10 +2897,7 @@ PyString_Format(PyObject *format, PyObject *args) case 'X': if (c == 'i') c = 'd'; - if (PyLong_Check(v) && PyLong_AsLong(v) == -1 - && PyErr_Occurred()) { - /* Too big for a C long. */ - PyErr_Clear(); + if (PyLong_Check(v)) { temp = _PyString_FormatLong(v, flags, prec, c, &pbuf, &len); if (!temp) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index b31675b..a297cac 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -5020,9 +5020,7 @@ PyObject *PyUnicode_Format(PyObject *format, case 'X': if (c == 'i') c = 'd'; - if (PyLong_Check(v) && PyLong_AsLong(v) == -1 - && PyErr_Occurred()) { - PyErr_Clear(); + if (PyLong_Check(v)) { temp = formatlong(v, flags, prec, c); if (!temp) goto onError; |