[Python-checkins] r68723 - in python/branches/release30-maint: Modules/_struct.c Modules/grpmodule.c Modules/selectmodule.c Objects/weakrefobject.c

[mark.dickinson]

Author: mark.dickinson
Date: Sun Jan 18 12:01:50 2009
New Revision: 68723

Log:
Merged revisions 68675 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r68675 | mark.dickinson | 2009-01-17 21:57:11 +0000 (Sat, 17 Jan 2009) | 2 lines
  
  Replace PyNumber_Int with PyNumber_Long.
........


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Modules/_struct.c
   python/branches/release30-maint/Modules/grpmodule.c
   python/branches/release30-maint/Modules/selectmodule.c
   python/branches/release30-maint/Objects/weakrefobject.c

Modified: python/branches/release30-maint/Modules/_struct.c
==============================================================================
--- python/branches/release30-maint/Modules/_struct.c	(original)
+++ python/branches/release30-maint/Modules/_struct.c	Sun Jan 18 12:01:50 2009
@@ -155,7 +155,7 @@
 			PyErr_Clear();
 			if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0)
 				return -1;
-			o = PyNumber_Int(v);
+			o = PyNumber_Long(v);
 			if (o == NULL)
 				return -1;
 			res = get_long(o, p);
@@ -260,7 +260,7 @@
 				PyErr_Clear();
 				if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0)
 					return -1;
-				o = PyNumber_Int(v);
+				o = PyNumber_Long(v);
 				if (o == NULL)
 					return -1;
 				res = get_wrapped_long(o, p);
@@ -299,7 +299,7 @@
 			PyErr_Clear();
 			if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0)
 				return -1;
-			o = PyNumber_Int(v);
+			o = PyNumber_Long(v);
 			if (o == NULL)
 				return -1;
 			res = get_wrapped_ulong(o, p);

Modified: python/branches/release30-maint/Modules/grpmodule.c
==============================================================================
--- python/branches/release30-maint/Modules/grpmodule.c	(original)
+++ python/branches/release30-maint/Modules/grpmodule.c	Sun Jan 18 12:01:50 2009
@@ -90,7 +90,7 @@
     unsigned int gid;
     struct group *p;
 
-    py_int_id = PyNumber_Int(pyo_id);
+    py_int_id = PyNumber_Long(pyo_id);
     if (!py_int_id)
 	    return NULL;
     gid = PyLong_AS_LONG(py_int_id);

Modified: python/branches/release30-maint/Modules/selectmodule.c
==============================================================================
--- python/branches/release30-maint/Modules/selectmodule.c	(original)
+++ python/branches/release30-maint/Modules/selectmodule.c	Sun Jan 18 12:01:50 2009
@@ -515,7 +515,7 @@
 		return NULL;
 	}
 	else {
-		tout = PyNumber_Int(tout);
+		tout = PyNumber_Long(tout);
 		if (!tout)
 			return NULL;
 		timeout = PyLong_AsLong(tout);

Modified: python/branches/release30-maint/Objects/weakrefobject.c
==============================================================================
--- python/branches/release30-maint/Objects/weakrefobject.c	(original)
+++ python/branches/release30-maint/Objects/weakrefobject.c	Sun Jan 18 12:01:50 2009
@@ -488,7 +488,7 @@
 WRAP_BINARY(proxy_and, PyNumber_And)
 WRAP_BINARY(proxy_xor, PyNumber_Xor)
 WRAP_BINARY(proxy_or, PyNumber_Or)
-WRAP_UNARY(proxy_int, PyNumber_Int)
+WRAP_UNARY(proxy_int, PyNumber_Long)
 WRAP_UNARY(proxy_float, PyNumber_Float)
 WRAP_BINARY(proxy_iadd, PyNumber_InPlaceAdd)
 WRAP_BINARY(proxy_isub, PyNumber_InPlaceSubtract)