From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 15 Apr 2011 05:19:32 +0000 (+0300)
Subject: #11845: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2586
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a15f614a0cc7bc76bac0fa1a6e050967ca1bacd7;p=python

#11845: Merge with 3.2.
---

a15f614a0cc7bc76bac0fa1a6e050967ca1bacd7
diff --cc Misc/NEWS
index bf75d8b6dc,8043c8bd9e..553adcd8e8
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,11 -10,9 +10,14 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #11845: Fix typo in rangeobject.c that caused a crash in
+   compute_slice_indices.  Patch by Daniel Urban.
+ 
 +- Issue #5673: Added a `timeout` keyword argument to subprocess.Popen.wait,
 +  subprocess.Popen.communicated, subprocess.call, subprocess.check_call, and
 +  subprocess.check_output.  If the blocking operation takes more than `timeout`
 +  seconds, the `subprocess.TimeoutExpired` exception is raised.
 +
  - Issue #11650: PyOS_StdioReadline() retries fgets() if it was interrupted
    (EINTR), for example if the program is stopped with CTRL+z on Mac OS X. Patch
    written by Charles-Francois Natali.