From: Brett Cannon <brett@python.org>
Date: Tue, 4 Jun 2013 21:36:07 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~578
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c97ec8fa6978657bfb8069db4128f785b29ea0aa;p=thirdparty%2FPython%2Fcpython.git

merge
---

c97ec8fa6978657bfb8069db4128f785b29ea0aa
diff --cc Misc/NEWS
index 09807f0fbbf1,d7ae7e195012..ce7a2485fbab
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,9 -10,9 +10,12 @@@ What's New in Python 3.4.0 Alpha 1
  Core and Builtins
  -----------------
  
 +- Tweak the exception message when the magic number or size value in a bytecode
 +  file is truncated.
 +
+ - Issue #17932: Fix an integer overflow issue on Windows 64-bit in iterators:
+   change the C type of seqiterobject.it_index from long to Py_ssize_t.
+ 
  - Issue #18065: Don't set __path__ to the package name for frozen packages.
  
  - Issue #18088: When reloading a module, unconditionally reset all relevant