[Python-checkins] r83753 - in python/branches/release31-maint: Misc/NEWS Modules/arraymodule.c

[mark.dickinson]

Author: mark.dickinson
Date: Fri Aug  6 11:42:28 2010
New Revision: 83753

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/arraymodule.c

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Fri Aug  6 11:42:28 2010
@@ -392,6 +392,10 @@
 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

Modified: python/branches/release31-maint/Modules/arraymodule.c
==============================================================================
--- python/branches/release31-maint/Modules/arraymodule.c	(original)
+++ python/branches/release31-maint/Modules/arraymodule.c	Fri Aug  6 11:42:28 2010
@@ -794,7 +794,7 @@
         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 @@
 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,