[Python-checkins] python/dist/src/Objects intobject.c,2.90,2.91 stringobject.c,2.178,2.179 unicodeobject.c,2.162,2.163

[gvanrossum@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv23675/Objects

Modified Files:
	intobject.c stringobject.c unicodeobject.c 
Log Message:
More changes of DeprecationWarning to FutureWarning.

Index: intobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/intobject.c,v
retrieving revision 2.90
retrieving revision 2.91
diff -C2 -d -r2.90 -r2.91
*** intobject.c	13 Aug 2002 10:05:56 -0000	2.90
--- intobject.c	14 Aug 2002 18:38:27 -0000	2.91
***************
*** 672,676 ****
  		return int_pos(v);
  	if (b >= LONG_BIT) {
! 		if (PyErr_Warn(PyExc_DeprecationWarning,
  			       "x<<y losing bits or changing sign "
  			       "will return a long in Python 2.4 and up") < 0)
--- 672,676 ----
  		return int_pos(v);
  	if (b >= LONG_BIT) {
! 		if (PyErr_Warn(PyExc_FutureWarning,
  			       "x<<y losing bits or changing sign "
  			       "will return a long in Python 2.4 and up") < 0)
***************
*** 680,684 ****
  	c = a << b;
  	if (a != Py_ARITHMETIC_RIGHT_SHIFT(long, c, b)) {
! 		if (PyErr_Warn(PyExc_DeprecationWarning,
  			       "x<<y losing bits or changing sign "
  			       "will return a long in Python 2.4 and up") < 0)
--- 680,684 ----
  	c = a << b;
  	if (a != Py_ARITHMETIC_RIGHT_SHIFT(long, c, b)) {
! 		if (PyErr_Warn(PyExc_FutureWarning,
  			       "x<<y losing bits or changing sign "
  			       "will return a long in Python 2.4 and up") < 0)
***************
*** 775,779 ****
  	long x = v -> ob_ival;
  	if (x < 0) {
! 		if (PyErr_Warn(PyExc_DeprecationWarning,
  			       "hex()/oct() of negative int will return "
  			       "a signed string in Python 2.4 and up") < 0)
--- 775,779 ----
  	long x = v -> ob_ival;
  	if (x < 0) {
! 		if (PyErr_Warn(PyExc_FutureWarning,
  			       "hex()/oct() of negative int will return "
  			       "a signed string in Python 2.4 and up") < 0)
***************
*** 793,797 ****
  	long x = v -> ob_ival;
  	if (x < 0) {
! 		if (PyErr_Warn(PyExc_DeprecationWarning,
  			       "hex()/oct() of negative int will return "
  			       "a signed string in Python 2.4 and up") < 0)
--- 793,797 ----
  	long x = v -> ob_ival;
  	if (x < 0) {
! 		if (PyErr_Warn(PyExc_FutureWarning,
  			       "hex()/oct() of negative int will return "
  			       "a signed string in Python 2.4 and up") < 0)

Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.178
retrieving revision 2.179
diff -C2 -d -r2.178 -r2.179
*** stringobject.c	14 Aug 2002 08:22:50 -0000	2.178
--- stringobject.c	14 Aug 2002 18:38:27 -0000	2.179
***************
*** 3470,3474 ****
  	}
  	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)
--- 3470,3474 ----
  	}
  	if (x < 0 && type != 'd' && type != 'i') {
! 		if (PyErr_Warn(PyExc_FutureWarning,
  			       "%u/%o/%x/%X of negative int will return "
  			       "a signed string in Python 2.4 and up") < 0)

Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.162
retrieving revision 2.163
diff -C2 -d -r2.162 -r2.163
*** unicodeobject.c	11 Aug 2002 12:23:04 -0000	2.162
--- unicodeobject.c	14 Aug 2002 18:38:27 -0000	2.163
***************
*** 5339,5343 ****
          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)
--- 5339,5343 ----
          return -1;
      if (x < 0 && type != 'd' && type != 'i') {
! 	if (PyErr_Warn(PyExc_FutureWarning,
  		       "%u/%o/%x/%X of negative int will return "
  		       "a signed string in Python 2.4 and up") < 0)