mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged the int/long unification branch, by very crude means (sorry Thomas!).

Browse source 
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.
This commit is contained in:
Guido van Rossum 2007-01-14 03:31:43 +00:00
parent 5b787e8bc2
commit ddefaf31b3
46 changed files with 798 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Objects/unicodeobject.c
View file

@ -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)