From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 1 May 2012 13:51:46 +0000 (-0400)
Subject: merge 3.2 (#14699)
X-Git-Tag: v3.3.0a4~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fbd2954583cbf252999991d7c58e4deacb2688c;p=python

merge 3.2 (#14699)
---

8fbd2954583cbf252999991d7c58e4deacb2688c
diff --cc Misc/NEWS
index e788404095,c24caacd38..6251da6416
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,25 -10,10 +10,27 @@@ What's New in Python 3.3.0 Alpha 3
  Core and Builtins
  -----------------
  
+ - Issue #14699: Fix calling the classmethod descriptor directly.
+ 
  - Issue #14433: Prevent msvcrt crash in interactive prompt when stdin
    is closed.
 +  
 +- Issue #14521: Make result of float('nan') and float('-nan') more
 +  consistent across platforms.
 +
 +- Issue #14646: __import__() sets __loader__ if the loader did not.
 +
 +- Issue #14605: No longer have implicit entries in sys.meta_path. If
 +  sys.meta_path is found to be empty, raise ImportWarning.
 +
 +- Issue #14605: No longer have implicit entries in sys.path_hooks. If
 +  sys.path_hooks is found to be empty, a warning will be raised. None is now
 +  inserted into sys.path_importer_cache if no finder was discovered. This also
 +  means imp.NullImporter is no longer implicitly used.
 +
 +- Issue #13903: Implement PEP 412. Individual dictionary instances can now share
 +  their keys with other dictionaries. Classes take advantage of this to share
 +  their instance dictionary keys for improved memory and performance.
  
  - Issue #11603 (again): Setting __repr__ to __str__ now raises a RuntimeError
    when repr() or str() is called on such an object.