Infra/lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removing python2 compatibility. (#518)

Browse Source
This commit is contained in:
kevgliss
2016-11-21 14:03:04 -08:00
committed by GitHub
parent 6eca2eb147
commit dd6d332166
7 changed files with 10 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lemur/plugins/lemur_java/tests/test_java.py
View File

@ -1,5 +1,4 @@
import pytest
import six
from lemur.tests.vectors import INTERNAL_CERTIFICATE_A_STR, INTERNAL_PRIVATE_KEY_A_STR
@ -24,7 +23,7 @@ def test_export_truststore_default_password(app):
actual = p.export(INTERNAL_CERTIFICATE_A_STR, "", "", options)
assert actual[0] == 'jks'
assert isinstance(actual[1], six.string_types)
assert isinstance(actual[1], str)
assert isinstance(actual[2], bytes)
@ -56,5 +55,5 @@ def test_export_keystore_default_password(app):
actual = p.export(INTERNAL_CERTIFICATE_A_STR, "", INTERNAL_PRIVATE_KEY_A_STR, options)
assert actual[0] == 'jks'
assert isinstance(actual[1], six.string_types)
assert isinstance(actual[1], str)
assert isinstance(actual[2], bytes)