traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace PyNumber_Int with PyNumber_Long.

This commit is contained in:
Mark Dickinson 2009-01-17 21:57:11 +00:00
parent e4bc7f69c2
commit 17c7cd8d02
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/_struct.c
View File

@ -155,7 +155,7 @@ get_long(PyObject *v, long *p)
PyErr_Clear(); PyErr_Clear();
if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0) if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0)
return -1; return -1;
o = PyNumber_Int(v); o = PyNumber_Long(v);
if (o == NULL) if (o == NULL)
return -1; return -1;
res = get_long(o, p); res = get_long(o, p);
@ -260,7 +260,7 @@ get_wrapped_long(PyObject *v, long *p)
PyErr_Clear(); PyErr_Clear();
if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0) if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0)
return -1; return -1;
o = PyNumber_Int(v); o = PyNumber_Long(v);
if (o == NULL) if (o == NULL)
return -1; return -1;
res = get_wrapped_long(o, p); res = get_wrapped_long(o, p);
@ -299,7 +299,7 @@ get_wrapped_ulong(PyObject *v, unsigned long *p)
PyErr_Clear(); PyErr_Clear();
if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0) if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0)
return -1; return -1;
o = PyNumber_Int(v); o = PyNumber_Long(v);
if (o == NULL) if (o == NULL)
return -1; return -1;
res = get_wrapped_ulong(o, p); res = get_wrapped_ulong(o, p);

2
Modules/grpmodule.c
View File

@ -90,7 +90,7 @@ grp_getgrgid(PyObject *self, PyObject *pyo_id)
unsigned int gid; unsigned int gid;
struct group *p; struct group *p;
py_int_id = PyNumber_Int(pyo_id); py_int_id = PyNumber_Long(pyo_id);
if (!py_int_id) if (!py_int_id)
return NULL; return NULL;
gid = PyLong_AS_LONG(py_int_id); gid = PyLong_AS_LONG(py_int_id);

2
Modules/selectmodule.c
View File

@ -515,7 +515,7 @@ poll_poll(pollObject *self, PyObject *args)
return NULL; return NULL;
} }
else { else {
tout = PyNumber_Int(tout); tout = PyNumber_Long(tout);
if (!tout) if (!tout)
return NULL; return NULL;
timeout = PyLong_AsLong(tout); timeout = PyLong_AsLong(tout);

2
Objects/weakrefobject.c
View File

@ -488,7 +488,7 @@ WRAP_BINARY(proxy_rshift, PyNumber_Rshift)
WRAP_BINARY(proxy_and, PyNumber_And) WRAP_BINARY(proxy_and, PyNumber_And)
WRAP_BINARY(proxy_xor, PyNumber_Xor) WRAP_BINARY(proxy_xor, PyNumber_Xor)
WRAP_BINARY(proxy_or, PyNumber_Or) 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_UNARY(proxy_float, PyNumber_Float)
WRAP_BINARY(proxy_iadd, PyNumber_InPlaceAdd) WRAP_BINARY(proxy_iadd, PyNumber_InPlaceAdd)
WRAP_BINARY(proxy_isub, PyNumber_InPlaceSubtract) WRAP_BINARY(proxy_isub, PyNumber_InPlaceSubtract)