From: INADA Naoki <songofacandy@gmail.com>
Date: Fri, 6 Jan 2017 08:44:43 +0000 (+0900)
Subject: Merge 3.6
X-Git-Tag: v3.7.0a1~1624
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ed28a8914eb0ab6caf3f45f911b1e36918af38d;p=thirdparty%2FPython%2Fcpython.git

Merge 3.6
---

7ed28a8914eb0ab6caf3f45f911b1e36918af38d
diff --cc Misc/NEWS
index 550dc76802e8,113ca8abbe84..741e49817118
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,12 -10,8 +10,14 @@@ What's New in Python 3.7.0 alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #29159: Fix regression in bytes(x) when x.__index__() raises Exception.
+ 
 +- Issue #29049: Call _PyObject_GC_TRACK() lazily when calling Python function.
 +  Calling function is up to 5% faster.
 +
 +- Issue #28927: bytes.fromhex() and bytearray.fromhex() now ignore all ASCII
 +  whitespace, not only spaces.  Patch by Robert Xiao.
 +
  - Issue #28932: Do not include <sys/random.h> if it does not exist.
  
  - Issue #25677: Correct the positioning of the syntax error caret for