Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.5.

This commit is contained in:
Stefan Krah 2015-11-10 18:35:47 +01:00
parent 3407cc26cb 7c3f3859a5
commit e2cf984384
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Objects/memoryobject.c
View File

@ -2242,7 +2242,7 @@ ptr_from_tuple(Py_buffer *view, PyObject *tup)
PyExc_IndexError); PyExc_IndexError);
if (index == -1 && PyErr_Occurred()) if (index == -1 && PyErr_Occurred())
return NULL; return NULL;
ptr = lookup_dimension(view, ptr, dim, index); ptr = lookup_dimension(view, ptr, (int)dim, index);
if (ptr == NULL) if (ptr == NULL)
return NULL; return NULL;
} }