aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/test_hkdf.py
diff options
context:
space:
mode:
authorEeshan Garg <jerryguitarist@gmail.com>2015-04-29 17:51:55 +0530
committerEeshan Garg <jerryguitarist@gmail.com>2015-04-29 17:51:55 +0530
commit424c0e253fe871dbc61b704caef0e0877b7e46f0 (patch)
tree4261827c08740791a378c71c08dc0f7da6be11af /tests/hazmat/primitives/test_hkdf.py
parent813c3280a47dfb163367cc12e7b85e6f301a7695 (diff)
downloadcryptography-424c0e253fe871dbc61b704caef0e0877b7e46f0.tar.gz
cryptography-424c0e253fe871dbc61b704caef0e0877b7e46f0.tar.bz2
cryptography-424c0e253fe871dbc61b704caef0e0877b7e46f0.zip
Refs #1870 - replace six.u with u prefix in tests/hazmat/primitives
Diffstat (limited to 'tests/hazmat/primitives/test_hkdf.py')
-rw-r--r--tests/hazmat/primitives/test_hkdf.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/hazmat/primitives/test_hkdf.py b/tests/hazmat/primitives/test_hkdf.py
index 48953414..e33529c9 100644
--- a/tests/hazmat/primitives/test_hkdf.py
+++ b/tests/hazmat/primitives/test_hkdf.py
@@ -8,8 +8,6 @@ import binascii
import pytest
-import six
-
from cryptography.exceptions import (
AlreadyFinalized, InvalidKey, _Reasons
)
@@ -97,7 +95,7 @@ class TestHKDF(object):
HKDF(
hashes.SHA256(),
16,
- salt=six.u("foo"),
+ salt=u"foo",
info=None,
backend=backend
)
@@ -107,7 +105,7 @@ class TestHKDF(object):
hashes.SHA256(),
16,
salt=None,
- info=six.u("foo"),
+ info=u"foo",
backend=backend
)
@@ -120,7 +118,7 @@ class TestHKDF(object):
backend=backend
)
- hkdf.derive(six.u("foo"))
+ hkdf.derive(u"foo")
with pytest.raises(TypeError):
hkdf = HKDF(
@@ -131,7 +129,7 @@ class TestHKDF(object):
backend=backend
)
- hkdf.verify(six.u("foo"), b"bar")
+ hkdf.verify(u"foo", b"bar")
with pytest.raises(TypeError):
hkdf = HKDF(
@@ -142,7 +140,7 @@ class TestHKDF(object):
backend=backend
)
- hkdf.verify(b"foo", six.u("bar"))
+ hkdf.verify(b"foo", u"bar")
@pytest.mark.requires_backend_interface(interface=HMACBackend)
@@ -198,7 +196,7 @@ class TestHKDFExpand(object):
hkdf = HKDFExpand(hashes.SHA256(), 42, info, backend)
with pytest.raises(TypeError):
- hkdf.derive(six.u("first"))
+ hkdf.derive(u"first")
def test_invalid_backend():