aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/test_pbkdf2hmac.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_pbkdf2hmac.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_pbkdf2hmac.py')
-rw-r--r--tests/hazmat/primitives/test_pbkdf2hmac.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/hazmat/primitives/test_pbkdf2hmac.py b/tests/hazmat/primitives/test_pbkdf2hmac.py
index df49d23c..7fb6bbd6 100644
--- a/tests/hazmat/primitives/test_pbkdf2hmac.py
+++ b/tests/hazmat/primitives/test_pbkdf2hmac.py
@@ -6,8 +6,6 @@ from __future__ import absolute_import, division, print_function
import pytest
-import six
-
from cryptography import utils
from cryptography.exceptions import (
AlreadyFinalized, InvalidKey, _Reasons
@@ -57,12 +55,12 @@ class TestPBKDF2HMAC(object):
def test_unicode_error_with_salt(self):
with pytest.raises(TypeError):
- PBKDF2HMAC(hashes.SHA1(), 20, six.u("salt"), 10, default_backend())
+ PBKDF2HMAC(hashes.SHA1(), 20, u"salt", 10, default_backend())
def test_unicode_error_with_key_material(self):
kdf = PBKDF2HMAC(hashes.SHA1(), 20, b"salt", 10, default_backend())
with pytest.raises(TypeError):
- kdf.derive(six.u("unicode here"))
+ kdf.derive(u"unicode here")
def test_invalid_backend():