summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2012-04-27 22:25:34 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2012-04-27 22:25:34 (GMT)
commitb11d91d969d9444b4df3e786c1dbba53da5b3ff0 (patch)
tree9dc1c303fa19dcbde31ad7e3aa71f440bc341329
parent92ff4e196bfd5361f231ab8629025d28af1decab (diff)
downloadcpython-b11d91d969d9444b4df3e786c1dbba53da5b3ff0.zip
cpython-b11d91d969d9444b4df3e786c1dbba53da5b3ff0.tar.gz
cpython-b11d91d969d9444b4df3e786c1dbba53da5b3ff0.tar.bz2
Fix my previous commit: bool is a long, restore the specical case for bool
-rw-r--r--Objects/unicodeobject.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index ac77114..68f11ff 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13481,7 +13481,10 @@ formatlong(PyObject *val, int flags, int prec, int type)
case 'd':
case 'u':
/* Special-case boolean: we want 0/1 */
- result = Py_TYPE(val)->tp_str(val);
+ if (PyBool_Check(val))
+ result = PyNumber_ToBase(val, 10);
+ else
+ result = Py_TYPE(val)->tp_str(val);
break;
case 'o':
numnondigits = 2;