summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-01-20 20:11:38 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-01-20 20:11:38 (GMT)
commitb4826c3fd160375903b1380b09490a016771d7c9 (patch)
tree2555add57fdfcc4b88e5593e0cef46092a77960d /Lib/test
parent08f3143aea534efb25b176ede8499a4bb23472f7 (diff)
parentb176d40398f4a6f15fc3f63ef55fb064eca13ee3 (diff)
downloadcpython-b4826c3fd160375903b1380b09490a016771d7c9.zip
cpython-b4826c3fd160375903b1380b09490a016771d7c9.tar.gz
cpython-b4826c3fd160375903b1380b09490a016771d7c9.tar.bz2
Merge with 3.4 (closes #23280)
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_binascii.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py
index 04d8f9d..22d53af 100644
--- a/Lib/test/test_binascii.py
+++ b/Lib/test/test_binascii.py
@@ -162,7 +162,9 @@ class BinASCIITest(unittest.TestCase):
self.assertRaises(binascii.Error, binascii.a2b_hex, t[:-1])
self.assertRaises(binascii.Error, binascii.a2b_hex, t[:-1] + b'q')
- self.assertEqual(binascii.hexlify(b'a'), b'61')
+ # Confirm that b2a_hex == hexlify and a2b_hex == unhexlify
+ self.assertEqual(binascii.hexlify(self.type2test(s)), t)
+ self.assertEqual(binascii.unhexlify(self.type2test(t)), u)
def test_qp(self):
# A test for SF bug 534347 (segfaults without the proper fix)