mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue 2440: revert r62269 and r62279. These changes were made in an effort to fix test_args2.Signed_TestCase.test_n(), which was failing on Windows x64 on the following line: 'self.failUnlessEqual(99, getargs_n(Long()))'. Although the two commits *did* fix the test on Windows x64, it's become clear that it's the test that's incorrect, and the changes to PyNumber_Index() in particular were not warranted (and actually violate PEP 357). This commit will get us back to where we were at r62268, before I started butchering things.

Browse source
This commit is contained in:
Trent Nelson 2008-04-11 23:02:37 +00:00
parent dd21912cd0
commit 7179220b57
3 changed files with 6 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_getargs2.py
View file

@ -63,10 +63,6 @@ class Int:
def __int__(self): def __int__(self):
return 99 return 99
class InvalidLongAsString:
def __int__(self):
return 'foobar'
class Unsigned_TestCase(unittest.TestCase): class Unsigned_TestCase(unittest.TestCase):
def test_b(self): def test_b(self):
from _testcapi import getargs_b from _testcapi import getargs_b
@ -203,7 +199,6 @@ class Signed_TestCase(unittest.TestCase):
self.failUnlessEqual(42, getargs_n(42)) self.failUnlessEqual(42, getargs_n(42))
self.assertRaises(OverflowError, getargs_n, VERY_LARGE) self.assertRaises(OverflowError, getargs_n, VERY_LARGE)
self.assertRaises(TypeError, getargs_n, InvalidLongAsString())
class LongLong_TestCase(unittest.TestCase): class LongLong_TestCase(unittest.TestCase):
def test_L(self): def test_L(self):

16
Objects/abstract.c
View file

@ -1220,7 +1220,6 @@ PyNumber_Absolute(PyObject *o)
PyObject * PyObject *
PyNumber_Index(PyObject *item) PyNumber_Index(PyObject *item)
{ {
PyNumberMethods *m;
PyObject *result = NULL; PyObject *result = NULL;
if (item == NULL) if (item == NULL)
return null_error(); return null_error();
@ -1228,9 +1227,8 @@ PyNumber_Index(PyObject *item)
Py_INCREF(item); Py_INCREF(item);
return item; return item;
} }
m = item->ob_type->tp_as_number;
if (PyIndex_Check(item)) { if (PyIndex_Check(item)) {
result = m->nb_index(item); result = item->ob_type->tp_as_number->nb_index(item);
if (result && !PyLong_Check(result)) { if (result && !PyLong_Check(result)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"__index__ returned non-int " "__index__ returned non-int "
@ -1240,17 +1238,7 @@ PyNumber_Index(PyObject *item)
return NULL; return NULL;
} }
} }
else if (m && m->nb_int != NULL && m->nb_float == NULL) { else {
result = m->nb_int(item);
if (result && !PyLong_Check(result)) {
PyErr_Format(PyExc_TypeError,
"__int__ returned non-int "
"(type %.200s)",
result->ob_type->tp_name);
Py_DECREF(result);
return NULL;
}
} else {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"'%.200s' object cannot be interpreted " "'%.200s' object cannot be interpreted "
"as an integer", item->ob_type->tp_name); "as an integer", item->ob_type->tp_name);

6
Python/getargs.c
View file

@ -663,6 +663,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
} }
case 'n': /* Py_ssize_t */ case 'n': /* Py_ssize_t */
#if SIZEOF_SIZE_T != SIZEOF_LONG
{ {
PyObject *iobj; PyObject *iobj;
Py_ssize_t *p = va_arg(*p_va, Py_ssize_t *); Py_ssize_t *p = va_arg(*p_va, Py_ssize_t *);
@ -671,13 +672,14 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
return converterr("integer<n>", arg, msgbuf, bufsize); return converterr("integer<n>", arg, msgbuf, bufsize);
iobj = PyNumber_Index(arg); iobj = PyNumber_Index(arg);
if (iobj != NULL) if (iobj != NULL)
ival = PyLong_AsSsize_t(iobj); ival = PyLong_AsSsize_t(arg);
if (ival == -1 && PyErr_Occurred()) if (ival == -1 && PyErr_Occurred())
return converterr("integer<n>", arg, msgbuf, bufsize); return converterr("integer<n>", arg, msgbuf, bufsize);
*p = ival; *p = ival;
break; break;
} }
#endif
/* Fall through from 'n' to 'l' if Py_ssize_t is int */
case 'l': {/* long int */ case 'l': {/* long int */
long *p = va_arg(*p_va, long *); long *p = va_arg(*p_va, long *);
long ival; long ival;