Merged revisions 68650-68653 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r68650 | mark.dickinson | 2009-01-17 09:45:37 +0000 (Sat, 17 Jan 2009) | 2 lines Remove a couple of references to long in the c-api docs ........ r68651 | mark.dickinson | 2009-01-17 10:04:45 +0000 (Sat, 17 Jan 2009) | 2 lines Issue #4910, patch 3/3: rename nb_long to nb_reserved ........ r68652 | mark.dickinson | 2009-01-17 10:21:23 +0000 (Sat, 17 Jan 2009) | 2 lines Fix a few more references to long integers in the docs. ........ r68653 | mark.dickinson | 2009-01-17 10:48:28 +0000 (Sat, 17 Jan 2009) | 2 lines Remove attempted long->int conversions in py3k version of float.as_integer_ratio. ........

--- a/Objects/floatobject.c	Sat Jan 17 16:54:09 2009 +0000
+++ b/Objects/floatobject.c	Sat Jan 17 18:00:58 2009 +0000
@@ -1495,12 +1495,6 @@
 		py_exponent = NULL;
 	}
 
-	/* Returns ints instead of longs where possible */
-	INPLACE_UPDATE(numerator, PyNumber_Int(numerator));
-	if (numerator == NULL) goto error;
-	INPLACE_UPDATE(denominator, PyNumber_Int(denominator));
-	if (denominator == NULL) goto error;
-
 	result_pair = PyTuple_Pack(2, numerator, denominator);
 
 #undef INPLACE_UPDATE
@@ -1798,7 +1792,7 @@
 	0,		/*nb_xor*/
 	0,		/*nb_or*/
 	float_trunc,	/*nb_int*/
-	0,		/*nb_long*/
+	0,		/*nb_reserved*/
 	float_float,	/*nb_float*/
 	0,		/* nb_inplace_add */
 	0,		/* nb_inplace_subtract */