diff options
author | Trent Nelson <trent.nelson@snakebite.org> | 2008-04-11 23:02:37 (GMT) |
---|---|---|
committer | Trent Nelson <trent.nelson@snakebite.org> | 2008-04-11 23:02:37 (GMT) |
commit | 7179220b57faca4606430b97847308b34f45f623 (patch) | |
tree | 8d50a92a88bb6569baae5fd557adbf80a7509615 /Python/getargs.c | |
parent | dd21912cd01f60434cb2e91fabd466d94a630244 (diff) | |
download | cpython-7179220b57faca4606430b97847308b34f45f623.zip cpython-7179220b57faca4606430b97847308b34f45f623.tar.gz cpython-7179220b57faca4606430b97847308b34f45f623.tar.bz2 |
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.
Diffstat (limited to 'Python/getargs.c')
-rw-r--r-- | Python/getargs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Python/getargs.c b/Python/getargs.c index 960c68c..1370e09 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -663,6 +663,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, } case 'n': /* Py_ssize_t */ +#if SIZEOF_SIZE_T != SIZEOF_LONG { PyObject *iobj; 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); iobj = PyNumber_Index(arg); if (iobj != NULL) - ival = PyLong_AsSsize_t(iobj); + ival = PyLong_AsSsize_t(arg); if (ival == -1 && PyErr_Occurred()) return converterr("integer<n>", arg, msgbuf, bufsize); *p = ival; break; } - +#endif + /* Fall through from 'n' to 'l' if Py_ssize_t is int */ case 'l': {/* long int */ long *p = va_arg(*p_va, long *); long ival; |