Merge pull request #359 from 1st1/bytesmod

Add support for proper %s formatting of newbytes

Author: jmadler

src/future/types/newbytes.py

@@ -174,6 +174,29 @@ 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, tuple):
+            newvals = []
+            for v in vals:
+                if isinstance(v, newbytes):
+                    v = _builtin_bytes.__str__(v)
+                newvals.append(v)
+            vals = tuple(newvals)
+
+        elif (hasattr(vals.__class__, '__getitem__') and
+                hasattr(vals.__class__, 'iteritems')):
+            for k, v in vals.iteritems():
+                if isinstance(v, newbytes):
+                    vals[k] = _builtin_bytes.__str__(v)
+
+        return _builtin_bytes.__mod__(self, vals)
+
+    def __imod__(self, other):
+        return self.__mod__(other)
+
     def join(self, iterable_of_bytes):
         errmsg = 'sequence item {0}: expected bytes, {1} found'
         if isbytes(iterable_of_bytes) or istext(iterable_of_bytes):

src/future/utils/__init__.py

@@ -56,6 +56,7 @@
 
 
 PY3 = sys.version_info[0] == 3
+PY35 = sys.version_info[0:2] >= (3, 5)
 PY2 = sys.version_info[0] == 2
 PY26 = sys.version_info[0:2] == (2, 6)
 PY27 = sys.version_info[0:2] == (2, 7)

tests/test_future/test_bytes.py

@@ -552,37 +552,83 @@ 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_imod(self):
-    #     """
-    #     From Py3.5 test suite (post-PEP 461)
-    #     """
-    #     # if (3, 0) <= sys.version_info[:2] < (3, 5):
-    #     #     raise unittest.SkipTest('bytes % not yet implemented on Py3.0-3.4')
-    #     b = bytes(b'hello, %b!')
-    #     orig = 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%%')
-    #     b %= (b'seventy-nine', 79)
-    #     self.assertEqual(b, b'seventy-nine / 100 = 79%')
+    @unittest.skipUnless(utils.PY2, 'test requires Python 2')
+    def test_mod_custom_dict(self):
+        import UserDict
+
+        class MyDict(UserDict.UserDict):
+            pass
+
+        d = MyDict()
+        d['foo'] = bytes(b'bar')
+        self.assertFalse(isinstance(d, dict))
+        self.assertTrue(isinstance(d, UserDict.UserDict))
+
+        self.assertEqual(bytes(b'%(foo)s') % d, b'bar')
+
+    @unittest.skipUnless(utils.PY35 or utils.PY2,
+                         'test requires Python 2 or 3.5+')
+    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')
+
+    @unittest.skipUnless(utils.PY35 or utils.PY2,
+                         'test requires Python 2 or 3.5+')
+    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.
+        """
+
+        # XXX Add support for %b!
+        #
+        # 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%')
+
+    @unittest.skipUnless(utils.PY35 or utils.PY2,
+                         'test requires Python 2 or 3.5+')
+    def test_imod(self):
+        """
+        From Py3.5 test suite (post-PEP 461)
+        """
+        # if (3, 0) <= sys.version_info[:2] < (3, 5):
+        #     raise unittest.SkipTest('bytes % not yet implemented on Py3.0-3.4')
+
+        # b = bytes(b'hello, %b!')
+        # orig = 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%%')
+        b %= (b'seventy-nine', 79)
+        self.assertEqual(b, b'seventy-nine / 100 = 79%')
+
+        b = bytes(b'%s / 100 = %d%%')
+        b %= (bytes(b'seventy-nine'), 79)
+        self.assertEqual(b, b'seventy-nine / 100 = 79%')
 
     # def test_mod_pep_461(self):
     #     """