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

Minor changes for python3. (#477)

Browse Source
This commit is contained in:
kevgliss
2016-11-07 14:33:07 -08:00
committed by GitHub
parent 4afedaf537
commit b74df2b3e4
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lemur/common/schema.py
View File

@ -136,7 +136,7 @@ def validate_schema(input_schema, output_schema):
resp = f(*args, **kwargs)
except Exception as e:
current_app.logger.exception(e)
return dict(message=e.message), 500
return dict(message=str(e)), 500
if isinstance(resp, tuple):
return resp[0], resp[1]

13
lemur/common/utils.py
View File

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