summaryrefslogtreecommitdiffstats
path: root/Objects/unicodeobject.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2002-08-11 04:24:12 (GMT)
committerGuido van Rossum <guido@python.org>2002-08-11 04:24:12 (GMT)
commit078151da901bebce6eb232d958fbbb1e5ced4399 (patch)
treed25483ba545d58138518591645e60caa20a7262b /Objects/unicodeobject.c
parentd92ae840e940db2fc8e9ec6293fe22dbb73f4514 (diff)
downloadcpython-078151da901bebce6eb232d958fbbb1e5ced4399.zip
cpython-078151da901bebce6eb232d958fbbb1e5ced4399.tar.gz
cpython-078151da901bebce6eb232d958fbbb1e5ced4399.tar.bz2
Implement stage B0 of PEP 237: add warnings for operations that
currently return inconsistent results for ints and longs; in particular: hex/oct/%u/%o/%x/%X of negative short ints, and x<<n that either loses bits or changes sign. (No warnings for repr() of a long, though that will also change to lose the trailing 'L' eventually.) This introduces some warnings in the test suite; I'll take care of those later.
Diffstat (limited to 'Objects/unicodeobject.c')
-rw-r--r--Objects/unicodeobject.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index d6fd62a..145186e 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -5219,6 +5219,10 @@ int usprintf(register Py_UNICODE *buffer, char *format, ...)
return len;
}
+/* XXX To save some code duplication, formatfloat/long/int could have been
+ shared with stringobject.c, converting from 8-bit to Unicode after the
+ formatting is done. */
+
static int
formatfloat(Py_UNICODE *buf,
size_t buflen,
@@ -5294,6 +5298,12 @@ formatint(Py_UNICODE *buf,
x = PyInt_AsLong(v);
if (x == -1 && PyErr_Occurred())
return -1;
+ if (x < 0 && type != 'd' && type != 'i') {
+ if (PyErr_Warn(PyExc_DeprecationWarning,
+ "%u/%o/%x/%X of negative int will return "
+ "a signed string in Python 2.4 and up") < 0)
+ return -1;
+ }
if (prec < 0)
prec = 1;