summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-10-14 17:18:54 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-10-14 17:18:54 (GMT)
commit96bb15bcb46b5e7cb3cd9ec62b8d2039e4ec7057 (patch)
treeba8d6fc99fb55f2133584a1d1cb0a4086eb0fbd6 /Lib/test
parentaf4ea65a3a7d97531fd79721dedf89564d6ed11a (diff)
downloadcpython-96bb15bcb46b5e7cb3cd9ec62b8d2039e4ec7057.zip
cpython-96bb15bcb46b5e7cb3cd9ec62b8d2039e4ec7057.tar.gz
cpython-96bb15bcb46b5e7cb3cd9ec62b8d2039e4ec7057.tar.bz2
Merged revisions 75404 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r75404 | antoine.pitrou | 2009-10-14 19:14:16 +0200 (mer., 14 oct. 2009) | 5 lines Issue #7065: Fix a crash in bytes.maketrans and bytearray.maketrans when using byte values greater than 127. Patch by egreen. ........
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_bytes.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index dd01b93..39c91b4 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -452,8 +452,9 @@ class BaseBytesTest(unittest.TestCase):
def test_maketrans(self):
transtable = b'\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037 !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`xyzdefghijklmnopqrstuvwxyz{|}~\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'
-
self.assertEqual(self.type2test.maketrans(b'abc', b'xyz'), transtable)
+ transtable = b'\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037 !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374xyz'
+ self.assertEqual(self.type2test.maketrans(b'\375\376\377', b'xyz'), transtable)
self.assertRaises(ValueError, self.type2test.maketrans, b'abc', b'xyzq')
self.assertRaises(TypeError, self.type2test.maketrans, 'abc', 'def')
@@ -1072,13 +1073,10 @@ class ByteArraySubclassTest(unittest.TestCase):
def test_main():
- test.support.run_unittest(BytesTest)
- test.support.run_unittest(ByteArrayTest)
- test.support.run_unittest(AssortedBytesTest)
- test.support.run_unittest(BytesAsStringTest)
- test.support.run_unittest(ByteArrayAsStringTest)
- test.support.run_unittest(ByteArraySubclassTest)
- test.support.run_unittest(BytearrayPEP3137Test)
+ test.support.run_unittest(
+ BytesTest, AssortedBytesTest, BytesAsStringTest,
+ ByteArrayTest, ByteArrayAsStringTest, ByteArraySubclassTest,
+ BytearrayPEP3137Test)
if __name__ == "__main__":
test_main()