Merge 3.6

Lib/test/test_bytes.py

@@ -4,6 +4,7 @@ XXX This is a mess.  Common tests should be unified with string_tests.py (and
 the latter should be modernized).
 """
 
+import array
 import os
 import re
 import sys
@@ -81,6 +82,18 @@ class BaseBytesTest:
         self.assertRaises(ValueError, self.type2test, [Indexable(-1)])
         self.assertRaises(ValueError, self.type2test, [Indexable(256)])
 
+    def test_from_buffer(self):
+        a = self.type2test(array.array('B', [1, 2, 3]))
+        self.assertEqual(a, b"\x01\x02\x03")
+
+        # http://bugs.python.org/issue29159
+        # Fallback when __index__ raises exception other than OverflowError
+        class B(bytes):
+            def __index__(self):
+                raise TypeError
+
+        self.assertEqual(self.type2test(B(b"foobar")), b"foobar")
+
     def test_from_ssize(self):
         self.assertEqual(self.type2test(0), b'')
         self.assertEqual(self.type2test(1), b'\x00')

Misc/NEWS

@@ -10,6 +10,8 @@ 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.
 

Objects/bytearrayobject.c

@@ -798,8 +798,11 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds)
     if (PyIndex_Check(arg)) {
         count = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
         if (count == -1 && PyErr_Occurred()) {
+            if (PyErr_ExceptionMatches(PyExc_OverflowError))
                 return -1;
+            PyErr_Clear();  /* fall through */
         }
+        else {
             if (count < 0) {
                 PyErr_SetString(PyExc_ValueError, "negative count");
                 return -1;
@@ -811,6 +814,7 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds)
             }
             return 0;
         }
+    }
 
     /* Use the buffer API */
     if (PyObject_CheckBuffer(arg)) {

Objects/bytesobject.c

@@ -2593,8 +2593,11 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     if (PyIndex_Check(x)) {
         size = PyNumber_AsSsize_t(x, PyExc_OverflowError);
         if (size == -1 && PyErr_Occurred()) {
+            if (PyErr_ExceptionMatches(PyExc_OverflowError))
                 return NULL;
+            PyErr_Clear();  /* fall through */
         }
+        else {
             if (size < 0) {
                 PyErr_SetString(PyExc_ValueError, "negative count");
                 return NULL;
@@ -2604,6 +2607,7 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                 return NULL;
             return new;
         }
+    }
 
     return PyBytes_FromObject(x);
 }