More changes of DeprecationWarning to FutureWarning.

Lib/test/test_b1.py

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

Lib/test/test_b2.py

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

Objects/intobject.c

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

Objects/stringobject.c

@@ -3469,7 +3469,7 @@ formatint(char *buf, size_t buflen, int flags,
 		return -1;
 	}
 	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 "
 			       "a signed string in Python 2.4 and up") < 0)
 			return -1;

Objects/unicodeobject.c

@@ -5338,7 +5338,7 @@ formatint(Py_UNICODE *buf,
     if (x == -1 && PyErr_Occurred())
         return -1;
     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 "
 		       "a signed string in Python 2.4 and up") < 0)
 	    return -1;