Merge 3.6

diff --cc Lib/test/test_bytes.py
Simple merge

diff --cc Misc/NEWS
index 550dc76802e8a97c69e6b9dc05fdca018a6d8fd9,113ca8abbe8467114f81d754e8d7daffb047a0fb..741e49817118bc55f7272c78bf2838192600adf1
--- 1/Misc/NEWS
--- 2/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

diff --cc Objects/bytearrayobject.c
Simple merge

diff --cc Objects/bytesobject.c
Simple merge