mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 19:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

More changes of DeprecationWarning to FutureWarning.

Browse source
This commit is contained in:
Guido van Rossum 2002-08-14 18:38:27 +00:00
parent 29c2106465
commit 54df53a352
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_b1.py
View file

@ -2,7 +2,7 @@
import warnings import warnings
warnings.filterwarnings("ignore", "hex../oct.. of negative int", warnings.filterwarnings("ignore", "hex../oct.. of negative int",
DeprecationWarning, __name__) FutureWarning, __name__)
from test.test_support import TestFailed, fcmp, have_unicode, TESTFN, unlink from test.test_support import TestFailed, fcmp, have_unicode, TESTFN, unlink

2
Lib/test/test_b2.py
View file

@ -2,7 +2,7 @@
import warnings import warnings
warnings.filterwarnings("ignore", "hex../oct.. of negative int", warnings.filterwarnings("ignore", "hex../oct.. of negative int",
DeprecationWarning, __name__) FutureWarning, __name__)
from test.test_support import TestFailed, fcmp, TESTFN, unlink, vereq from test.test_support import TestFailed, fcmp, TESTFN, unlink, vereq

8
Objects/intobject.c
View file

@ -671,7 +671,7 @@ int_lshift(PyIntObject *v, PyIntObject *w)
if (a == 0 || b == 0) if (a == 0 || b == 0)
return int_pos(v); return int_pos(v);
if (b >= LONG_BIT) { if (b >= LONG_BIT) {
if (PyErr_Warn(PyExc_DeprecationWarning, if (PyErr_Warn(PyExc_FutureWarning,
"x<<y losing bits or changing sign " "x<<y losing bits or changing sign "
"will return a long in Python 2.4 and up") < 0) "will return a long in Python 2.4 and up") < 0)
return NULL; return NULL;
@ -679,7 +679,7 @@ int_lshift(PyIntObject *v, PyIntObject *w)
} }
c = a << b; c = a << b;
if (a != Py_ARITHMETIC_RIGHT_SHIFT(long, c, b)) { if (a != Py_ARITHMETIC_RIGHT_SHIFT(long, c, b)) {
if (PyErr_Warn(PyExc_DeprecationWarning, if (PyErr_Warn(PyExc_FutureWarning,
"x<<y losing bits or changing sign " "x<<y losing bits or changing sign "
"will return a long in Python 2.4 and up") < 0) "will return a long in Python 2.4 and up") < 0)
return NULL; return NULL;
@ -774,7 +774,7 @@ int_oct(PyIntObject *v)
char buf[100]; char buf[100];
long x = v -> ob_ival; long x = v -> ob_ival;
if (x < 0) { if (x < 0) {
if (PyErr_Warn(PyExc_DeprecationWarning, if (PyErr_Warn(PyExc_FutureWarning,
"hex()/oct() of negative int will return " "hex()/oct() of negative int will return "
"a signed string in Python 2.4 and up") < 0) "a signed string in Python 2.4 and up") < 0)
return NULL; return NULL;
@ -792,7 +792,7 @@ int_hex(PyIntObject *v)
char buf[100]; char buf[100];
long x = v -> ob_ival; long x = v -> ob_ival;
if (x < 0) { if (x < 0) {
if (PyErr_Warn(PyExc_DeprecationWarning, if (PyErr_Warn(PyExc_FutureWarning,
"hex()/oct() of negative int will return " "hex()/oct() of negative int will return "
"a signed string in Python 2.4 and up") < 0) "a signed string in Python 2.4 and up") < 0)
return NULL; return NULL;

2
Objects/stringobject.c
View file

@ -3469,7 +3469,7 @@ formatint(char *buf, size_t buflen, int flags,
return -1; return -1;
} }
if (x < 0 && type != 'd' && type != 'i') { if (x < 0 && type != 'd' && type != 'i') {
if (PyErr_Warn(PyExc_DeprecationWarning, if (PyErr_Warn(PyExc_FutureWarning,
"%u/%o/%x/%X of negative int will return " "%u/%o/%x/%X of negative int will return "
"a signed string in Python 2.4 and up") < 0) "a signed string in Python 2.4 and up") < 0)
return -1; return -1;

2
Objects/unicodeobject.c
View file

@ -5338,7 +5338,7 @@ formatint(Py_UNICODE *buf,
if (x == -1 && PyErr_Occurred()) if (x == -1 && PyErr_Occurred())
return -1; return -1;
if (x < 0 && type != 'd' && type != 'i') { if (x < 0 && type != 'd' && type != 'i') {
if (PyErr_Warn(PyExc_DeprecationWarning, if (PyErr_Warn(PyExc_FutureWarning,
"%u/%o/%x/%X of negative int will return " "%u/%o/%x/%X of negative int will return "
"a signed string in Python 2.4 and up") < 0) "a signed string in Python 2.4 and up") < 0)
return -1; return -1;