mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 79745 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79745 | mark.dickinson | 2010-04-04 09:43:04 +0100 (Sun, 04 Apr 2010) | 3 lines

  Issue #8300 (__index__ handling in struct.pack): Remove redundant check
  and improve test coverage.  Thanks Meador Inge for the patch.
........
This commit is contained in:
Mark Dickinson 2010-04-04 08:52:51 +00:00
parent 4c28ddc2f2
commit e9493a1872
2 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Modules/_struct.c
View file

@ -102,12 +102,6 @@ get_pylong(PyObject *v)
v = PyNumber_Index(v);
if (v == NULL)
return NULL;
if (!PyLong_Check(v)) {
PyErr_SetString(PyExc_TypeError,
"__index__ method "
"returned non-integer");
return NULL;
}
}
else {
PyErr_SetString(StructError,
@ -118,6 +112,7 @@ get_pylong(PyObject *v)
else
Py_INCREF(v);
assert(PyLong_Check(v));
return v;
}