From: Raymond Hettinger <python@rcn.com>
Date: Tue, 22 Nov 2016 01:24:58 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.7.0a1~1901
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9af740b99a19a85ad5f38379b6175cf4ead685ba;p=thirdparty%2FPython%2Fcpython.git

merge
---

9af740b99a19a85ad5f38379b6175cf4ead685ba
diff --cc Misc/NEWS
index 5cf3bc86e8c1,cc421b03e2af..4eb0408a8940
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,11 -10,12 +10,15 @@@ What's New in Python 3.7.0 alpha 
  Core and Builtins
  -----------------
  
 +- Issue #28731: Optimize _PyDict_NewPresized() to create correct size dict.
 +  Improve speed of dict literal with constant keys up to 30%.
 +
  - Issue #28532: Show sys.version when -V option is supplied twice.
  
+ - Issue #27100: The with-statement now checks for __enter__ before it
+   checks for __exit__.  This gives less confusing error messages when
+   both methods are missing. Patch by Jonathan Ellington.
+ 
  - Issue #28746: Fix the set_inheritable() file descriptor method on platforms
    that do not have the ioctl FIOCLEX and FIONCLEX commands.