Drop byte_literal in favour of b''
diff --git a/tests/test_cli.py b/tests/test_cli.py
index aad734a..4ae8da3 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -15,7 +15,6 @@
import rsa
import rsa.cli
import rsa.util
-from rsa._compat import b
if sys.version_info[0] < 3:
def make_buffer():
@@ -135,8 +134,8 @@
rsa.cli.keygen()
lines = get_bytes_out(out).splitlines()
- self.assertEqual(b('-----BEGIN RSA PRIVATE KEY-----'), lines[0])
- self.assertEqual(b('-----END RSA PRIVATE KEY-----'), lines[-1])
+ self.assertEqual(b'-----BEGIN RSA PRIVATE KEY-----', lines[0])
+ self.assertEqual(b'-----END RSA PRIVATE KEY-----', lines[-1])
# The key size should be shown on stderr
self.assertTrue('128-bit key' in err.getvalue())
@@ -217,7 +216,7 @@
# We should have the original cleartext on stdout now.
output = get_bytes_out(out)
- self.assertEqual(b('Hello cleartext RSA users!'), output)
+ self.assertEqual(b'Hello cleartext RSA users!', output)
@cleanup_files('encrypted.txt', 'cleartext.txt')
def test_encrypt_decrypt_unhappy(self):
diff --git a/tests/test_common.py b/tests/test_common.py
index e26e004..af13695 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -17,14 +17,14 @@
import unittest
import struct
-from rsa._compat import byte, b
+from rsa._compat import byte
from rsa.common import byte_size, bit_size, inverse
class TestByte(unittest.TestCase):
def test_values(self):
- self.assertEqual(byte(0), b('\x00'))
- self.assertEqual(byte(255), b('\xff'))
+ self.assertEqual(byte(0), b'\x00')
+ self.assertEqual(byte(255), b'\xff')
def test_struct_error_when_out_of_bounds(self):
self.assertRaises(struct.error, byte, 256)
diff --git a/tests/test_compat.py b/tests/test_compat.py
index 2a58df5..0013155 100644
--- a/tests/test_compat.py
+++ b/tests/test_compat.py
@@ -18,7 +18,7 @@
import struct
import sys
-from rsa._compat import b, byte, is_bytes, range
+from rsa._compat import byte, is_bytes, range
class TestByte(unittest.TestCase):
@@ -33,4 +33,4 @@
self.assertRaises(struct.error, byte, -1)
def test_byte_literal(self):
- self.assertIsInstance(b('abc'), bytes)
+ self.assertIsInstance(b'abc', bytes)
diff --git a/tests/test_load_save_keys.py b/tests/test_load_save_keys.py
index 0caa067..ef6584b 100644
--- a/tests/test_load_save_keys.py
+++ b/tests/test_load_save_keys.py
@@ -21,55 +21,53 @@
import os.path
import pickle
-from rsa._compat import b
-
import rsa.key
-B64PRIV_DER = b('MC4CAQACBQDeKYlRAgMBAAECBQDHn4npAgMA/icCAwDfxwIDANcXAgInbwIDAMZt')
+B64PRIV_DER = b'MC4CAQACBQDeKYlRAgMBAAECBQDHn4npAgMA/icCAwDfxwIDANcXAgInbwIDAMZt'
PRIVATE_DER = base64.standard_b64decode(B64PRIV_DER)
-B64PUB_DER = b('MAwCBQDeKYlRAgMBAAE=')
+B64PUB_DER = b'MAwCBQDeKYlRAgMBAAE='
PUBLIC_DER = base64.standard_b64decode(B64PUB_DER)
-PRIVATE_PEM = b('''
+PRIVATE_PEM = b'''\
-----BEGIN CONFUSING STUFF-----
Cruft before the key
-----BEGIN RSA PRIVATE KEY-----
Comment: something blah
-%s
+''' + B64PRIV_DER + b'''
-----END RSA PRIVATE KEY-----
Stuff after the key
-----END CONFUSING STUFF-----
-''' % B64PRIV_DER.decode("utf-8"))
+'''
-CLEAN_PRIVATE_PEM = b('''\
+CLEAN_PRIVATE_PEM = b'''\
-----BEGIN RSA PRIVATE KEY-----
-%s
+''' + B64PRIV_DER + b'''
-----END RSA PRIVATE KEY-----
-''' % B64PRIV_DER.decode("utf-8"))
+'''
-PUBLIC_PEM = b('''
+PUBLIC_PEM = b'''\
-----BEGIN CONFUSING STUFF-----
Cruft before the key
-----BEGIN RSA PUBLIC KEY-----
Comment: something blah
-%s
+''' + B64PUB_DER + b'''
-----END RSA PUBLIC KEY-----
Stuff after the key
-----END CONFUSING STUFF-----
-''' % B64PUB_DER.decode("utf-8"))
+'''
-CLEAN_PUBLIC_PEM = b('''\
+CLEAN_PUBLIC_PEM = b'''\
-----BEGIN RSA PUBLIC KEY-----
-%s
+''' + B64PUB_DER + b'''
-----END RSA PUBLIC KEY-----
-''' % B64PUB_DER.decode("utf-8"))
+'''
class DerTest(unittest.TestCase):
diff --git a/tests/test_pem.py b/tests/test_pem.py
index 3e03ab0..5fb9600 100644
--- a/tests/test_pem.py
+++ b/tests/test_pem.py
@@ -17,7 +17,7 @@
import unittest
-from rsa._compat import b, is_bytes
+from rsa._compat import is_bytes
from rsa.pem import _markers
import rsa.key
@@ -49,8 +49,8 @@
class TestMarkers(unittest.TestCase):
def test_values(self):
self.assertEqual(_markers('RSA PRIVATE KEY'),
- (b('-----BEGIN RSA PRIVATE KEY-----'),
- b('-----END RSA PRIVATE KEY-----')))
+ (b'-----BEGIN RSA PRIVATE KEY-----',
+ b'-----END RSA PRIVATE KEY-----'))
class TestBytesAndStrings(unittest.TestCase):
diff --git a/tests/test_pkcs1.py b/tests/test_pkcs1.py
index 5702aae..bd1fd81 100644
--- a/tests/test_pkcs1.py
+++ b/tests/test_pkcs1.py
@@ -21,7 +21,7 @@
import rsa
from rsa import pkcs1
-from rsa._compat import byte, b, is_bytes
+from rsa._compat import byte, is_bytes
class BinaryTest(unittest.TestCase):
@@ -73,7 +73,7 @@
def test_sign_verify(self):
"""Test happy flow of sign and verify"""
- message = b('je moeder')
+ message = b'je moeder'
print("\tMessage: %r" % message)
signature = pkcs1.sign(message, self.priv, 'SHA-256')
@@ -84,16 +84,16 @@
def test_alter_message(self):
"""Altering the message should let the verification fail."""
- signature = pkcs1.sign(b('je moeder'), self.priv, 'SHA-256')
+ signature = pkcs1.sign(b'je moeder', self.priv, 'SHA-256')
self.assertRaises(pkcs1.VerificationError, pkcs1.verify,
- b('mijn moeder'), signature, self.pub)
+ b'mijn moeder', signature, self.pub)
def test_sign_different_key(self):
"""Signing with another key should let the verification fail."""
(otherpub, _) = rsa.newkeys(512)
- message = b('je moeder')
+ message = b'je moeder'
signature = pkcs1.sign(message, self.priv, 'SHA-256')
self.assertRaises(pkcs1.VerificationError, pkcs1.verify,
message, signature, otherpub)
diff --git a/tests/test_transform.py b/tests/test_transform.py
index 7fe121b..fe0970c 100644
--- a/tests/test_transform.py
+++ b/tests/test_transform.py
@@ -15,37 +15,36 @@
# limitations under the License.
import unittest
-from rsa._compat import b
from rsa.transform import int2bytes, bytes2int, _int2bytes
class Test_int2bytes(unittest.TestCase):
def test_accuracy(self):
- self.assertEqual(int2bytes(123456789), b('\x07[\xcd\x15'))
- self.assertEqual(_int2bytes(123456789), b('\x07[\xcd\x15'))
+ self.assertEqual(int2bytes(123456789), b'\x07[\xcd\x15')
+ self.assertEqual(_int2bytes(123456789), b'\x07[\xcd\x15')
def test_codec_identity(self):
self.assertEqual(bytes2int(int2bytes(123456789, 128)), 123456789)
self.assertEqual(bytes2int(_int2bytes(123456789, 128)), 123456789)
def test_chunk_size(self):
- self.assertEqual(int2bytes(123456789, 6), b('\x00\x00\x07[\xcd\x15'))
+ self.assertEqual(int2bytes(123456789, 6), b'\x00\x00\x07[\xcd\x15')
self.assertEqual(int2bytes(123456789, 7),
- b('\x00\x00\x00\x07[\xcd\x15'))
+ b'\x00\x00\x00\x07[\xcd\x15')
self.assertEqual(_int2bytes(123456789, 6),
- b('\x00\x00\x07[\xcd\x15'))
+ b'\x00\x00\x07[\xcd\x15')
self.assertEqual(_int2bytes(123456789, 7),
- b('\x00\x00\x00\x07[\xcd\x15'))
+ b'\x00\x00\x00\x07[\xcd\x15')
def test_zero(self):
- self.assertEqual(int2bytes(0, 4), b('\x00') * 4)
- self.assertEqual(int2bytes(0, 7), b('\x00') * 7)
- self.assertEqual(int2bytes(0), b('\x00'))
+ self.assertEqual(int2bytes(0, 4), b'\x00' * 4)
+ self.assertEqual(int2bytes(0, 7), b'\x00' * 7)
+ self.assertEqual(int2bytes(0), b'\x00')
- self.assertEqual(_int2bytes(0, 4), b('\x00') * 4)
- self.assertEqual(_int2bytes(0, 7), b('\x00') * 7)
- self.assertEqual(_int2bytes(0), b('\x00'))
+ self.assertEqual(_int2bytes(0, 4), b'\x00' * 4)
+ self.assertEqual(_int2bytes(0, 7), b'\x00' * 7)
+ self.assertEqual(_int2bytes(0), b'\x00')
def test_correctness_against_base_implementation(self):
# Slow test.
