merge 3.3 (#16722)

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

diff --cc Misc/NEWS
index 7890f64f5eb6ec43098453769a6bd7651d50084c,509ea66752615071f3119b1af9f639f668e7ea0f..77db4e10a86c9af8d33a7483f3c73d9d9ada0435
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,10 -12,9 +10,13 @@@ What's New in Python 3.4.0 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #16722: In the bytes() constructor, try to call __bytes__ on the
+   argument before __index__.
+ 
 +- Issue #16421: loading multiple modules from one shared object is now
 +  handled correctly (previously, the first module loaded from that file
 +  was silently returned). Patch by Václav Šmilauer.
 +
  - Issue #16602: When a weakref's target was part of a long deallocation
    chain, the object could remain reachable through its weakref even though
    its refcount had dropped to zero.

diff --cc Objects/bytesobject.c
Simple merge