mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 06:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Patch #1733960: Allow T_LONGLONG to accept ints.

Browse source 
Will backport to 2.5.
This commit is contained in:
Martin v. Löwis 2007-06-09 07:42:52 +00:00
parent 080b598990
commit 6371cd8177
6 changed files with 75 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Python/structmember.c
View file

@ -293,31 +293,25 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
}
break;
#ifdef HAVE_LONG_LONG
case T_LONGLONG:
if (!PyLong_Check(v)) {
PyErr_BadArgument();
case T_LONGLONG:{
PY_LONG_LONG value;
*(PY_LONG_LONG*)addr = value = PyLong_AsLongLong(v);
if ((value == -1) && PyErr_Occurred())
return -1;
} else {
PY_LONG_LONG value;
*(PY_LONG_LONG*)addr = value = PyLong_AsLongLong(v);
if ((value == -1) && PyErr_Occurred()) {
return -1;
}
}
break;
case T_ULONGLONG:
if (!PyLong_Check(v)) {
PyErr_BadArgument();
return -1;
} else {
unsigned PY_LONG_LONG value;
*(unsigned PY_LONG_LONG*)addr = value = PyLong_AsUnsignedLongLong(v);
if ((value == (unsigned PY_LONG_LONG)-1) &&
PyErr_Occurred()) {
return -1;
}
}
break;
break;
}
case T_ULONGLONG:{
unsigned PY_LONG_LONG value;
/* ??? PyLong_AsLongLong accepts an int, but PyLong_AsUnsignedLongLong
doesn't ??? */
if (PyLong_Check(v))
*(unsigned PY_LONG_LONG*)addr = value = PyLong_AsUnsignedLongLong(v);
else
*(unsigned PY_LONG_LONG*)addr = value = PyInt_AsLong(v);
if ((value == (unsigned PY_LONG_LONG)-1) && PyErr_Occurred())
return -1;
break;
}
#endif /* HAVE_LONG_LONG */
default:
PyErr_Format(PyExc_SystemError,