Mercurial > cpython-lru_cache-weakref

comparison Modules/_struct.c @ 50866:8325eb041921 3.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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. ........
author Mark Dickinson <dickinsm@gmail.com>
date Sun, 18 Jan 2009 11:01:50 +0000
parents 427e43d0e031
children 87fbbf22adf3
comparison
equal deleted inserted replaced
50856:9e2ad440196b 50866:8325eb041921
153 PyObject *o; 153 PyObject *o;
154 int res; 154 int res;
155 PyErr_Clear(); 155 PyErr_Clear();
156 if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0) 156 if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0)
157 return -1; 157 return -1;
158 o = PyNumber_Int(v); 158 o = PyNumber_Long(v);
159 if (o == NULL) 159 if (o == NULL)
160 return -1; 160 return -1;
161 res = get_long(o, p); 161 res = get_long(o, p);
162 Py_DECREF(o); 162 Py_DECREF(o);
163 return res; 163 return res;
258 PyObject *o; 258 PyObject *o;
259 int res; 259 int res;
260 PyErr_Clear(); 260 PyErr_Clear();
261 if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0) 261 if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0)
262 return -1; 262 return -1;
263 o = PyNumber_Int(v); 263 o = PyNumber_Long(v);
264 if (o == NULL) 264 if (o == NULL)
265 return -1; 265 return -1;
266 res = get_wrapped_long(o, p); 266 res = get_wrapped_long(o, p);
267 Py_DECREF(o); 267 Py_DECREF(o);
268 return res; 268 return res;
297 PyObject *o; 297 PyObject *o;
298 int res; 298 int res;
299 PyErr_Clear(); 299 PyErr_Clear();
300 if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0) 300 if (PyErr_WarnEx(PyExc_DeprecationWarning, FLOAT_COERCE, 2) < 0)
301 return -1; 301 return -1;
302 o = PyNumber_Int(v); 302 o = PyNumber_Long(v);
303 if (o == NULL) 303 if (o == NULL)
304 return -1; 304 return -1;
305 res = get_wrapped_ulong(o, p); 305 res = get_wrapped_ulong(o, p);
306 Py_DECREF(o); 306 Py_DECREF(o);
307 return res; 307 return res;