From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 18 Apr 2012 15:26:02 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a3~167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=447f0cc38673cfea3a6ede5aaf11e80e8e8181b2;p=python

merge 3.2
---

447f0cc38673cfea3a6ede5aaf11e80e8e8181b2
diff --cc Misc/NEWS
index 0e55a24a5f,bfae292e2a..06fcf2a589
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,21 -10,10 +10,21 @@@ What's New in Python 3.3.0 Alpha 3
  Core and Builtins
  -----------------
  
 +- Issue #12599: Be more strict in accepting None compared to a false-like
 +  object for importlib.util.module_for_loader and
 +  importlib.machinery.PathFinder.
 +
  - Issue #14612: Fix jumping around with blocks by setting f_lineno.
  
 +- 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 #14607: Fix 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 #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.