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

Issue19995: issue deprecation warning for non-integer values to %c, %o, %x, %X

Browse source
This commit is contained in:
Ethan Furman 2014-01-11 23:20:58 -08:00
parent 57bc1e21e7
commit f9bba9c67f
4 changed files with 49 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Objects/unicodeobject.c
View file

@ -14004,11 +14004,24 @@ mainformatlong(PyObject *v,
if (!PyNumber_Check(v))
goto wrongtype;
/* make sure number is a type of integer */
/* if not, issue depracation warning for now */
if (!PyLong_Check(v)) {
if (type == 'o' || type == 'x' || type == 'X') {
iobj = PyNumber_Index(v);
if (iobj == NULL) {
return -1;
PyErr_Clear();
if (PyErr_WarnEx(PyExc_DeprecationWarning,
"automatic int conversions have been deprecated",
1)) {
return -1;
}
iobj = PyNumber_Long(v);
if (iobj == NULL ) {
if (PyErr_ExceptionMatches(PyExc_TypeError))
goto wrongtype;
return -1;
}
}
}
else {
@ -14090,10 +14103,22 @@ formatchar(PyObject *v)
PyObject *iobj;
long x;
/* make sure number is a type of integer */
/* if not, issue depracation warning for now */
if (!PyLong_Check(v)) {
iobj = PyNumber_Index(v);
if (iobj == NULL) {
goto onError;
PyErr_Clear();
if (PyErr_WarnEx(PyExc_DeprecationWarning,
"automatic int conversions have been deprecated",
1)) {
return -1;
}
iobj = PyNumber_Long(v);
if (iobj == NULL ) {
if (PyErr_ExceptionMatches(PyExc_TypeError))
goto onError;
return -1;
}
}
v = iobj;
Py_DECREF(iobj);