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

Invert the checks in get_[u]long and get_[u]longlong. The intent was 

to not accept float types; the result was that integer-like objects
were not accepted.

Ported from release25-maint.
This commit is contained in:
Thomas Heller 2008-01-24 19:15:02 +00:00
parent 5a05364049
commit 5ca924038d
2 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/ctypes/test/test_numbers.py
View File

@ -105,15 +105,31 @@ class NumberTestCase(unittest.TestCase):
def test_floats(self): def test_floats(self):
# c_float and c_double can be created from # c_float and c_double can be created from
# Python int, long and float # Python int, long and float
class FloatLike(object):
def __float__(self):
return 2.0
f = FloatLike()
for t in float_types: for t in float_types:
self.failUnlessEqual(t(2.0).value, 2.0) self.failUnlessEqual(t(2.0).value, 2.0)
self.failUnlessEqual(t(2).value, 2.0) self.failUnlessEqual(t(2).value, 2.0)
self.failUnlessEqual(t(2L).value, 2.0) self.failUnlessEqual(t(2L).value, 2.0)
self.failUnlessEqual(t(f).value, 2.0)
def test_integers(self): def test_integers(self):
# integers cannot be constructed from floats class FloatLike(object):
def __float__(self):
return 2.0
f = FloatLike()
class IntLike(object):
def __int__(self):
return 2
i = IntLike()
# integers cannot be constructed from floats,
# but from integer-like objects
for t in signed_types + unsigned_types: for t in signed_types + unsigned_types:
self.assertRaises(TypeError, t, 3.14) self.assertRaises(TypeError, t, 3.14)
self.assertRaises(TypeError, t, f)
self.failUnlessEqual(t(i).value, 2)
def test_sizes(self): def test_sizes(self):
for t in signed_types + unsigned_types + float_types + bool_types: for t in signed_types + unsigned_types + float_types + bool_types:

34
Modules/_ctypes/cfield.c
View File

@ -346,10 +346,9 @@ static int
get_long(PyObject *v, long *p) get_long(PyObject *v, long *p)
{ {
long x; long x;
if (!PyInt_Check(v) && !PyLong_Check(v)) { if (PyFloat_Check(v)) {
PyErr_Format(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"int expected instead of %s instance", "int expected instead of float");
v->ob_type->tp_name);
return -1; return -1;
} }
x = PyInt_AsUnsignedLongMask(v); x = PyInt_AsUnsignedLongMask(v);
@ -365,10 +364,9 @@ static int
get_ulong(PyObject *v, unsigned long *p) get_ulong(PyObject *v, unsigned long *p)
{ {
unsigned long x; unsigned long x;
if (!PyInt_Check(v) && !PyLong_Check(v)) { if (PyFloat_Check(v)) {
PyErr_Format(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"int expected instead of %s instance", "int expected instead of float");
v->ob_type->tp_name);
return -1; return -1;
} }
x = PyInt_AsUnsignedLongMask(v); x = PyInt_AsUnsignedLongMask(v);
@ -386,11 +384,10 @@ static int
get_longlong(PyObject *v, PY_LONG_LONG *p) get_longlong(PyObject *v, PY_LONG_LONG *p)
{ {
PY_LONG_LONG x; PY_LONG_LONG x;
if (!PyInt_Check(v) && !PyLong_Check(v)) { if (PyFloat_Check(v)) {
PyErr_Format(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"int expected instead of %s instance", "int expected instead of float");
v->ob_type->tp_name); return -1;
return -1;
} }
x = PyInt_AsUnsignedLongLongMask(v); x = PyInt_AsUnsignedLongLongMask(v);
if (x == -1 && PyErr_Occurred()) if (x == -1 && PyErr_Occurred())
@ -405,12 +402,11 @@ static int
get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p) get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p)
{ {
unsigned PY_LONG_LONG x; unsigned PY_LONG_LONG x;
if (!PyInt_Check(v) && !PyLong_Check(v)) { if (PyFloat_Check(v)) {
PyErr_Format(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"int expected instead of %s instance", "int expected instead of float");
v->ob_type->tp_name); return -1;
return -1; }
}
x = PyInt_AsUnsignedLongLongMask(v); x = PyInt_AsUnsignedLongLongMask(v);
if (x == -1 && PyErr_Occurred()) if (x == -1 && PyErr_Occurred())
return -1; return -1;