From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 17 Apr 2012 23:54:35 +0000 (-0400)
Subject: merge 3.2 (#14607)
X-Git-Tag: v3.3.0a3~173^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a1fdc4c760bf862accf625558e9bf54b9b9cd7c;p=python

merge 3.2 (#14607)
---

2a1fdc4c760bf862accf625558e9bf54b9b9cd7c
diff --cc Misc/NEWS
index 9f0009fad8,2c135638b5..60471a4b95
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,16 -10,8 +10,18 @@@ What's New in Python 3.3.0 Alpha 3
  Core and Builtins
  -----------------
  
 +- Issue #14592: Attempting a relative import w/o __package__ or __name__ set in
 +  globals raises a KeyError.
 +
+ - Issue #14607: Fix defaults keyword-only arguments which started with ``__``.
+ 
 +- Issue #10854: The ImportError raised when an extension module on Windows
 +  fails to import now uses the new path and name attributes from
 +  Issue #1559549.
 +
 +- Issue #14582: Import directly returns the module as returned by a loader when
 +  possible instead of fetching it from sys.modules.
 +
  - Issue #13889: Check and (if necessary) set FPU control word before calling
    any of the dtoa.c string <-> float conversion functions, on MSVC builds of
    Python.  This fixes issues when embedding Python in a Delphi app.