Merge branch 'master' into v0.16.x

Author: edschofield

src/future/types/newbytes.py

@@ -100,6 +100,8 @@ def __new__(cls, *args, **kwargs):
                 newargs.append(errors)
             value = args[0].encode(*newargs)
             ###
+        elif hasattr(args[0], '__bytes__'):
+            value = args[0].__bytes__()
         elif isinstance(args[0], Iterable):
             if len(args[0]) == 0:
                 # This could be an empty list or tuple. Return b'' as on Py3.

src/future/utils/surrogateescape.py

@@ -83,7 +83,7 @@ def replace_surrogate_encode(mystring):
         # The following magic comes from Py3.3's Python/codecs.c file:
         if not 0xD800 <= code <= 0xDCFF:
             # Not a surrogate. Fail with the original exception.
-            raise exc
+            raise NotASurrogateError
         # mybytes = [0xe0 | (code >> 12),
         #            0x80 | ((code >> 6) & 0x3f),
         #            0x80 | (code & 0x3f)]

tests/test_future/test_bytes.py

@@ -707,6 +707,31 @@ def test_issue_171_part_b(self):
         b = nativebytes(bytes(b'asdf'))
         self.assertEqual(b, b'asdf')
 
+    def test_cast_to_bytes(self):
+        """
+        Tests whether __bytes__ method is called
+        """
+
+        class TestObject:
+            def __bytes__(self):
+                return b'asdf'
+
+        self.assertEqual(bytes(TestObject()), b'asdf')
+
+    def test_cast_to_bytes_iter_precedence(self):
+        """
+        Tests that call to __bytes__ is preferred to iteration
+        """
+
+        class TestObject:
+            def __bytes__(self):
+                return b'asdf'
+
+            def __iter__(self):
+                return iter(b'hjkl')
+
+        self.assertEqual(bytes(TestObject()), b'asdf')
+
 
 if __name__ == '__main__':
     unittest.main()

tests/test_future/test_surrogateescape.py

@@ -33,6 +33,12 @@ def test_encode_ascii_surrogateescape(self):
         b = payload.encode('ascii', 'surrogateescape')
         self.assertEqual(b, b'cMO2c3RhbA\xc3\xa1=\n')
 
+    def test_encode_ascii_unicode(self):
+        """
+        Verify that exceptions are raised properly.
+        """
+        self.assertRaises(UnicodeEncodeError, u'\N{SNOWMAN}'.encode, 'US-ASCII', 'surrogateescape')
+
     @expectedFailurePY2
     def test_encode_ascii_surrogateescape_non_newstr(self):
         """