Mercurial > cpython-lru_cache-weakref

diff Objects/unicodeobject.c @ 40626:4aee3f672f77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Guido van Rossum <guido@python.org>
date Sun, 14 Jan 2007 03:31:43 +0000
parents cc992d75d5b3
children f2f0b41f270d
line wrap: on
line diff
--- a/Objects/unicodeobject.c	Sat Jan 13 23:54:39 2007 +0000
+++ b/Objects/unicodeobject.c	Sun Jan 14 03:31:43 2007 +0000
@@ -7585,6 +7585,8 @@
 		    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 @@
 			goto onError;
 		    }
 		    prec = PyInt_AsLong(v);
+		    if (prec == -1 && PyErr_Occurred())
+			goto onError;
 		    if (prec < 0)
 			prec = 0;
 		    if (--fmtcnt >= 0)