[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5.

Tue Nov 10 12:36:19 EST 2015

https://hg.python.org/cpython/rev/7ef2d85fc1a7
changeset: 99049:7ef2d85fc1a7
parent: 99047:1f253802435e
parent: 99048:e445ebe2ec0c
user: Stefan Krah <skrah at bytereef.org>
date: Tue Nov 10 18:35:47 2015 +0100
summary:
 Merge 3.5.
files:
 Objects/memoryobject.c | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -2242,7 +2242,7 @@
 PyExc_IndexError);
 if (index == -1 && PyErr_Occurred())
 return NULL;
- ptr = lookup_dimension(view, ptr, dim, index);
+ ptr = lookup_dimension(view, ptr, (int)dim, index);
 if (ptr == NULL)
 return NULL;
 }
-- 
Repository URL: https://hg.python.org/cpython
