Merge branch 'byte-find' of https://github.com/syphar/python-future

Author: edschofield

future/builtins/types/newbytes.py

@@ -163,11 +163,11 @@ def fromhex(cls, string):
 
     @no(unicode)
     def find(self, sub, *args):
-        return newbytes(super(newbytes, self).find(sub, *args))
+        return super(newbytes, self).find(sub, *args)
 
     @no(unicode)
     def rfind(self, sub, *args):
-        return newbytes(super(newbytes, self).rfind(sub, *args))
+        return super(newbytes, self).rfind(sub, *args)
 
     @no(unicode, (1, 2))
     def replace(self, old, new, *args):

future/tests/test_bytes.py

@@ -168,6 +168,18 @@ def test_bytes_plus_bytes(self):
         self.assertEqual(b4, b'ZYXWABCD')
         self.assertTrue(isinstance(b4, bytes))
 
+    def test_find_not_found(self):
+        self.assertEqual(-1, bytes(b'ABCDE').find(b':'))
+
+    def test_find_found(self):
+        self.assertEqual(2, bytes(b'AB:CD:E').find(b':'))
+
+    def test_rfind_not_found(self):
+        self.assertEqual(-1, bytes(b'ABCDE').find(b':'))
+
+    def test_rfind_found(self):
+        self.assertEqual(4, bytes(b'AB:CD:E').find(b':'))
+
     def test_bytes_join_bytes(self):
         b = bytes(b' * ')
         strings = [b'AB', b'EFGH', b'IJKL']