[Python-checkins] cpython (3.5): Issue #26764: Bacported tests for bytes formatting.

Fri Apr 15 07:14:42 EDT 2016

https://hg.python.org/cpython/rev/8dee0c09b46e
changeset: 100983:8dee0c09b46e
branch: 3.5
parent: 100979:af655e73f7bd
user: Serhiy Storchaka <storchaka at gmail.com>
date: Fri Apr 15 14:13:37 2016 +0300
summary:
 Issue #26764: Bacported tests for bytes formatting.
files:
 Lib/test/test_bytes.py | 37 ++++++++---------------------
 1 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -469,26 +469,33 @@
 self.assertRaises(ValueError, b.rindex, w, 1, 3)
 
 def test_mod(self):
- b = b'hello, %b!'
+ b = self.type2test(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%%'
+ b = self.type2test(b'%s / 100 = %d%%')
 a = b % (b'seventy-nine', 79)
 self.assertEqual(a, b'seventy-nine / 100 = 79%')
+ self.assertIs(type(a), self.type2test)
 
 def test_imod(self):
- b = b'hello, %b!'
+ b = self.type2test(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 = b'%s / 100 = %d%%'
+ b = self.type2test(b'%s / 100 = %d%%')
 b %= (b'seventy-nine', 79)
 self.assertEqual(b, b'seventy-nine / 100 = 79%')
+ self.assertIs(type(b), self.type2test)
+
+ def test_rmod(self):
+ with self.assertRaises(TypeError):
+ object() % self.type2test(b'abc')
+ self.assertIs(self.type2test(b'abc').__rmod__('%r'), NotImplemented)
 
 def test_replace(self):
 b = self.type2test(b'mississippi')
@@ -969,28 +976,6 @@
 b[8:] = b
 self.assertEqual(b, bytearray(list(range(8)) + list(range(256))))
 
- def test_mod(self):
- b = bytearray(b'hello, %b!')
- orig = b
- b = b % b'world'
- self.assertEqual(b, b'hello, world!')
- self.assertEqual(orig, bytearray(b'hello, %b!'))
- self.assertFalse(b is orig)
- b = bytearray(b'%s / 100 = %d%%')
- a = b % (b'seventy-nine', 79)
- self.assertEqual(a, bytearray(b'seventy-nine / 100 = 79%'))
-
- def test_imod(self):
- b = bytearray(b'hello, %b!')
- orig = b
- b %= b'world'
- self.assertEqual(b, b'hello, world!')
- self.assertEqual(orig, bytearray(b'hello, %b!'))
- self.assertFalse(b is orig)
- b = bytearray(b'%s / 100 = %d%%')
- b %= (b'seventy-nine', 79)
- self.assertEqual(b, bytearray(b'seventy-nine / 100 = 79%'))
-
 def test_iconcat(self):
 b = bytearray(b"abc")
 b1 = b
-- 
Repository URL: https://hg.python.org/cpython
