Add support for proper %s formatting of newbytes

Author: 1st1

src/future/types/newbytes.py

@@ -174,6 +174,22 @@ def __mul__(self, other):
     def __rmul__(self, other):
         return newbytes(super(newbytes, self).__rmul__(other))
 
+    def __mod__(self, vals):
+        if isinstance(vals, newbytes):
+            vals = _builtin_bytes.__str__(vals)
+        elif isinstance(vals, dict):
+            for k, v in vals.items():
+                if isinstance(v, newbytes):
+                    vals[k] = _builtin_bytes.__str__(v)
+        elif isinstance(vals, tuple):
+            newvals = []
+            for v in vals:
+                if isinstance(v, newbytes):
+                    v = _builtin_bytes.__str__(v)
+                newvals.append(v)
+            vals = tuple(newvals)
+        return _builtin_bytes.__mod__(self, vals)
+
     def join(self, iterable_of_bytes):
         errmsg = 'sequence item {0}: expected bytes, {1} found'
         if isbytes(iterable_of_bytes) or istext(iterable_of_bytes):

tests/test_future/test_bytes.py

@@ -552,21 +552,38 @@ def test_maketrans(self):
         self.assertRaises(ValueError, bytes.maketrans, b'abc', b'xyzq')
         self.assertRaises(TypeError, bytes.maketrans, 'abc', 'def')
 
-    # def test_mod(self):
-    #     """
-    #     From Py3.5 test suite (post-PEP 461).
-    #
-    #     The bytes mod code is in _PyBytes_Format() in bytesobject.c in Py3.5.
-    #     """
-    #     b = b'hello, %b!'
-    #     orig = b
-    #     b = b % b'world'
-    #     self.assertEqual(b, b'hello, world!')
-    #     self.assertEqual(orig, b'hello, %b!')
-    #     self.assertFalse(b is orig)
-    #     b = b'%s / 100 = %d%%'
-    #     a = b % (b'seventy-nine', 79)
-    #     self.assertEqual(a, b'seventy-nine / 100 = 79%')
+    def test_mod_more(self):
+        self.assertEqual(b'%s' % b'aaa', b'aaa')
+        self.assertEqual(bytes(b'%s') % b'aaa', b'aaa')
+        self.assertEqual(bytes(b'%s') % bytes(b'aaa'), b'aaa')
+
+        self.assertEqual(b'%s' % (b'aaa',), b'aaa')
+        self.assertEqual(bytes(b'%s') % (b'aaa',), b'aaa')
+        self.assertEqual(bytes(b'%s') % (bytes(b'aaa'),), b'aaa')
+
+        self.assertEqual(bytes(b'%(x)s') % {'x': b'aaa'}, b'aaa')
+        self.assertEqual(bytes(b'%(x)s') % {'x': bytes(b'aaa')}, b'aaa')
+
+    def test_mod(self):
+        """
+        From Py3.5 test suite (post-PEP 461).
+
+        The bytes mod code is in _PyBytes_Format() in bytesobject.c in Py3.5.
+        """
+        # b = bytes(b'hello, %b!')
+        # orig = b
+        # b = b % b'world'
+        # self.assertEqual(b, b'hello, world!')
+        # self.assertEqual(orig, b'hello, %b!')
+        # self.assertFalse(b is orig)
+
+        b = bytes(b'%s / 100 = %d%%')
+        a = b % (b'seventy-nine', 79)
+        self.assertEqual(a, b'seventy-nine / 100 = 79%')
+
+        b = bytes(b'%s / 100 = %d%%')
+        a = b % (bytes(b'seventy-nine'), 79)
+        self.assertEqual(a, b'seventy-nine / 100 = 79%')
 
     # def test_imod(self):
     #     """