[3.6] bpo-29714: Fix a regression that bytes format may fail when containing zero bytes inside. (GH-504)

This commit is contained in:
Xiang Zhang 2017-03-06 18:17:10 +08:00 committed by GitHub
parent 4e1a065c20
commit df6d7b406f
3 changed files with 15 additions and 2 deletions

View file

@ -507,6 +507,11 @@ class BaseBytesTest:
a = b % (b'seventy-nine', 79)
self.assertEqual(a, b'seventy-nine / 100 = 79%')
self.assertIs(type(a), self.type2test)
# issue 29714
b = self.type2test(b'hello,\x00%b!')
b = b % b'world'
self.assertEqual(b, b'hello,\x00world!')
self.assertIs(type(b), self.type2test)
def test_imod(self):
b = self.type2test(b'hello, %b!')
@ -519,6 +524,11 @@ class BaseBytesTest:
b %= (b'seventy-nine', 79)
self.assertEqual(b, b'seventy-nine / 100 = 79%')
self.assertIs(type(b), self.type2test)
# issue 29714
b = self.type2test(b'hello,\x00%b!')
b %= b'world'
self.assertEqual(b, b'hello,\x00world!')
self.assertIs(type(b), self.type2test)
def test_rmod(self):
with self.assertRaises(TypeError):