From: Mark Dickinson <dickinsm@gmail.com>
Date: Fri, 6 Aug 2010 09:42:28 +0000 (+0000)
Subject: Merged revisions 83751-83752 via svnmerge from
X-Git-Tag: v3.1.3rc1~386
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13197f4e29bf13ef04891142367febf7705693dc;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 83751-83752 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83751 | mark.dickinson | 2010-08-06 10:36:57 +0100 (Fri, 06 Aug 2010) | 1 line

  Issue #9526:  Remove outdated casts to int that were preventing the array module from working correctly with arrays > 2GB.
........
  r83752 | mark.dickinson | 2010-08-06 10:38:58 +0100 (Fri, 06 Aug 2010) | 1 line

  Misc/NEWS entry for r83751.
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index f210a3018a44..84ce9c842326 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -392,6 +392,10 @@ Library
 Extension Modules
 -----------------
 
+- Issue #9526: Remove some outdated (int) casts that were preventing
+  the array module from working correctly with arrays of more than
+  2**31 elements.
+
 - Fix memory leak in ssl._ssl._test_decode_cert.
 
 - Issue #8065: Fix memory leak in readline module (from failure to
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index b6cffa01ea0f..59f20a5da81a 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -794,7 +794,7 @@ array_iter_extend(arrayobject *self, PyObject *bb)
         return -1;
 
     while ((v = PyIter_Next(it)) != NULL) {
-        if (ins1(self, (int) Py_SIZE(self), v) != 0) {
+        if (ins1(self, Py_SIZE(self), v) != 0) {
             Py_DECREF(v);
             Py_DECREF(it);
             return -1;
@@ -1069,7 +1069,7 @@ the buffer length in bytes.");
 static PyObject *
 array_append(arrayobject *self, PyObject *v)
 {
-    return ins(self, (int) Py_SIZE(self), v);
+    return ins(self, Py_SIZE(self), v);
 }
 
 PyDoc_STRVAR(append_doc,