summaryrefslogtreecommitdiff
path: root/tests/test_util.py
diff options
context:
space:
mode:
authorMatěj Cepl <mcepl@cepl.eu>2018-03-18 21:50:38 +0100
committerMatěj Cepl <mcepl@cepl.eu>2018-03-19 12:25:50 +0100
commitb977909fc93caa599e52943be25b7f6042a4c70b (patch)
tree75b02a848786f7c7cdb8c4220e7f5bc39befd8a6 /tests/test_util.py
parentd15ceaa99cbe560052c7fe9ecbbc77ecfd3d18b6 (diff)
downloadm2crypto-b977909fc93caa599e52943be25b7f6042a4c70b.tar.gz
Replace util.py3{bytes,str} with six.ensure_{binary,text}
Diffstat (limited to 'tests/test_util.py')
-rw-r--r--tests/test_util.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/test_util.py b/tests/test_util.py
index 7053655..c4b3c0e 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -18,36 +18,36 @@ from M2Crypto import util, six
class UtilTestCase(unittest.TestCase):
def test_py3bytes(self):
- self.assertIsInstance(util.py3bytes('test'), bytes)
+ self.assertIsInstance(six.ensure_binary('test'), bytes)
def test_py3str(self):
- self.assertIsInstance(util.py3str('test'), str)
+ self.assertIsInstance(six.ensure_text('test'), str)
def test_py3bytes_str(self):
- self.assertIsInstance(util.py3bytes(u'test'), bytes)
+ self.assertIsInstance(six.ensure_binary(u'test'), bytes)
def test_py3str_str(self):
- self.assertIsInstance(util.py3str(u'test'), six.string_types)
+ self.assertIsInstance(six.ensure_text(u'test'), six.string_types)
def test_py3bytes_bytes(self):
- self.assertIsInstance(util.py3bytes(b'test'), bytes)
+ self.assertIsInstance(six.ensure_binary(b'test'), bytes)
def test_py3str_bytes(self):
- self.assertIsInstance(util.py3str(b'test'), str)
+ self.assertIsInstance(six.ensure_text(b'test'), str)
def test_py3bytes_bytearray(self):
- self.assertIsInstance(util.py3bytes(bytearray(b'test')), bytearray)
+ self.assertIsInstance(six.ensure_binary(bytearray(b'test')), bytearray)
def test_py3str_bytearray(self):
- self.assertIsInstance(util.py3str(bytearray(b'test')), str)
+ self.assertIsInstance(six.ensure_text(bytearray(b'test')), str)
def test_py3bytes_None(self):
with self.assertRaises(TypeError):
- util.py3bytes(None)
+ six.ensure_binary(None)
def test_py3str_None(self):
with self.assertRaises(TypeError):
- util.py3str(None)
+ six.ensure_text(None)
def suite():