[Python-checkins] python/dist/src/Objects floatobject.c,2.118,2.119

[nnorwitz@users.sourceforge.net]

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

Modified Files:
	floatobject.c 
Log Message:
Fix SF bug# 676155, RuntimeWarning with tp_compare

Check return value of PyLong_AsDouble(), it can return an error.


Index: floatobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/floatobject.c,v
retrieving revision 2.118
retrieving revision 2.119
diff -C2 -d -r2.118 -r2.119
*** floatobject.c	21 Nov 2002 22:26:37 -0000	2.118
--- floatobject.c	28 Jan 2003 19:21:24 -0000	2.119
***************
*** 630,634 ****
  	}
  	else if (PyLong_Check(*pw)) {
! 		*pw = PyFloat_FromDouble(PyLong_AsDouble(*pw));
  		Py_INCREF(*pv);
  		return 0;
--- 630,637 ----
  	}
  	else if (PyLong_Check(*pw)) {
! 		double x = PyLong_AsDouble(*pw);
! 		if (x == -1.0 && PyErr_Occurred())
! 			return -1;
! 		*pw = PyFloat_FromDouble(x);
  		Py_INCREF(*pv);
  		return 0;