From: Ned Deily <nad@acm.org>
Date: Fri, 2 Aug 2013 04:37:17 +0000 (-0700)
Subject: Issue #17557: merge from 3.3
X-Git-Tag: v3.4.0a1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffb32893a35082798a511cb47cdcf3376455a59f;p=python

Issue #17557: merge from 3.3
---

ffb32893a35082798a511cb47cdcf3376455a59f
diff --cc Misc/ACKS
index 2e38ee3dea,54fa661fbe..16167ae0a6
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -737,9 -721,9 +737,10 @@@ Petri Lehtine
  Luke Kenneth Casson Leighton
  Tshepang Lekhonkhobe
  Marc-André Lemburg
+ Mateusz Lenik
  John Lenton
  Kostyantyn Leschenko
 +Benno Leslie
  Christopher Tur Lesniewski-Laas
  Alain Leufroy
  Mark Levinson
diff --cc Misc/NEWS
index 04bce96a89,f0cbca20e7..bc6a810fb1
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -184,18 -59,9 +184,21 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #17557: Fix os.getgroups() to work with the modified behavior of
+   getgroups(2) on OS X 10.8.  Original patch by Mateusz Lenik.
+ 
 +- Issue #18608: Avoid keeping a strong reference to the locale module
 +  inside the _io module.
 +
 +- Issue #18619: Fix atexit leaking callbacks registered from sub-interpreters,
 +  and make it GC-aware.
 +
 +- Issue #15699: The readline module now uses PEP 3121-style module
 +  initialization, so as to reclaim allocated resources (Python callbacks)
 +  at shutdown.  Original patch by Robin Schreiber.
 +
 +- Issue #17616: wave.open now supports the context manager protocol.
 +
  - Issue #18599: Fix name attribute of _sha1.sha1() object. It now returns
    'SHA1' instead of 'SHA'.