diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-04-29 09:22:11 -0400 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-04-29 09:22:11 -0400 |
commit | 699ec19d8021c4203f7e741094c699292d4ce80f (patch) | |
tree | 4261827c08740791a378c71c08dc0f7da6be11af /tests/hazmat/primitives/test_padding.py | |
parent | 813c3280a47dfb163367cc12e7b85e6f301a7695 (diff) | |
parent | 424c0e253fe871dbc61b704caef0e0877b7e46f0 (diff) | |
download | cryptography-699ec19d8021c4203f7e741094c699292d4ce80f.tar.gz cryptography-699ec19d8021c4203f7e741094c699292d4ce80f.tar.bz2 cryptography-699ec19d8021c4203f7e741094c699292d4ce80f.zip |
Merge pull request #1873 from eeshangarg/starter-project-1870
Refs #1870 - replace six.u with the u prefix in tests/hazmat/primitives
Diffstat (limited to 'tests/hazmat/primitives/test_padding.py')
-rw-r--r-- | tests/hazmat/primitives/test_padding.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/hazmat/primitives/test_padding.py b/tests/hazmat/primitives/test_padding.py index ef7952a9..392ea737 100644 --- a/tests/hazmat/primitives/test_padding.py +++ b/tests/hazmat/primitives/test_padding.py @@ -6,8 +6,6 @@ from __future__ import absolute_import, division, print_function import pytest -import six - from cryptography.exceptions import AlreadyFinalized from cryptography.hazmat.primitives import padding @@ -35,10 +33,10 @@ class TestPKCS7(object): def test_non_bytes(self): padder = padding.PKCS7(128).padder() with pytest.raises(TypeError): - padder.update(six.u("abc")) + padder.update(u"abc") unpadder = padding.PKCS7(128).unpadder() with pytest.raises(TypeError): - unpadder.update(six.u("abc")) + unpadder.update(u"abc") @pytest.mark.parametrize(("size", "unpadded", "padded"), [ ( |