From: Michael Foord <michael@voidspace.org.uk>
Date: Tue, 29 Jan 2013 23:14:59 +0000 (+0000)
Subject: Merge
X-Git-Tag: v3.3.1rc1~267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1da29c99d7704be75abac8651ec2f6adba6e4ab;p=python

Merge
---

d1da29c99d7704be75abac8651ec2f6adba6e4ab
diff --cc Misc/NEWS
index 66bdb03a2c,e9cd8c7781..8a5510fd12
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -173,6 -211,17 +173,9 @@@ Librar
  - Issue #1602133: on Mac OS X a shared library build (``--enable-shared``)
    now fills the ``os.environ`` variable correctly.
  
 -- Issue #14471: Fix a possible buffer overrun in the winreg module.
 -
 -Library
 --------
 -
+ - Issue #15505: `unittest.installHandler` no longer assumes SIGINT handler is
+   set to a callable object.
+ 
 -- Issue #12004: Fix an internal error in PyZipFile when writing an invalid
 -  Python file.  Patch by Ben Morgan.
 -
  - Issue #9290: In IDLE the sys.std* streams now implement io.TextIOBase
    interface and support all mandatory methods and properties.