From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 19 Dec 2012 21:28:46 +0000 (-0600)
Subject: merge 3.3 (#16722)
X-Git-Tag: v3.4.0a1~1810
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7643c92cdd0e8a3cfd83be9edae3964097b63f0e;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#16722)
---

7643c92cdd0e8a3cfd83be9edae3964097b63f0e
diff --cc Misc/NEWS
index 7890f64f5eb6,509ea6675261..77db4e10a86c
--- a/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.