Removing python2 compatibility. (#518)

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

View File

@@ -6,8 +6,6 @@
.. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
"""
import six
import sys
import string
import random
@@ -37,10 +35,7 @@ def get_psuedo_random_string():
def parse_certificate(body):
if sys.version_info[0] <= 2:
return x509.load_pem_x509_certificate(bytes(body), default_backend())
if isinstance(body, six.string_types):
if isinstance(body, str):
body = body.encode('utf-8')
return x509.load_pem_x509_certificate(body, default_backend())