From 73886dc1beebb5cdeeff73bf2e585678fdf706ab Mon Sep 17 00:00:00 2001 From: Genaro Madrid Date: Tue, 14 Jun 2016 18:44:28 -0500 Subject: [PATCH] code style python 2.7 fixes --- mifiel/api_auth/signature.py | 6 +++++- mifiel/base.py | 9 +++++++-- mifiel/certificate.py | 2 +- mifiel/document.py | 7 +++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/mifiel/api_auth/signature.py b/mifiel/api_auth/signature.py index 7770356..f5bff78 100644 --- a/mifiel/api_auth/signature.py +++ b/mifiel/api_auth/signature.py @@ -23,7 +23,11 @@ def build(self, method, url, body, content_md5=None, content_type=None, httpdate if not body: body = '' if isinstance(body, str): - m.update(body.encode('ascii')) + try: + m.update(body.encode('ascii')) + # For Python 2.7 + except(UnicodeDecodeError): + m.update(body) else: m.update(body) diff --git a/mifiel/base.py b/mifiel/base.py index 5b29967..dcabf5e 100644 --- a/mifiel/base.py +++ b/mifiel/base.py @@ -1,6 +1,5 @@ from mifiel import Response import requests -from os.path import basename class Base(object): def __init__(self, client, path): @@ -26,8 +25,14 @@ def url(self, path=None): def process_request(self, method, url=None, data=None, files=None): if not url: url = self.url() + if method == 'post': - response = requests.post(url, auth=self.client.auth, data=data, files=files) + response = requests.post( + url=url, + auth=self.client.auth, + data=data, + files=files + ) elif method == 'put': response = requests.put(url, auth=self.client.auth, json=data) elif method == 'get': diff --git a/mifiel/certificate.py b/mifiel/certificate.py index 586824e..3d647c8 100644 --- a/mifiel/certificate.py +++ b/mifiel/certificate.py @@ -1,5 +1,5 @@ from mifiel import Base -class Document(Base): +class Certificate(Base): def __init__(self, client): Base.__init__(self, client, 'keys') diff --git a/mifiel/document.py b/mifiel/document.py index 3edbb10..434a008 100644 --- a/mifiel/document.py +++ b/mifiel/document.py @@ -1,5 +1,6 @@ from mifiel import Base import mimetypes +from os.path import basename class Document(Base): def __init__(self, client): @@ -21,8 +22,10 @@ def create(client, signatories, file=None, dhash=None, callback_url=None): sig_numbers = {} for index, item in enumerate(signatories): - for key, val in item.iteritems(): - sig_numbers.update({'signatories['+str(index)+']['+str(key)+']':val}) + for key, val in item.items(): + sig_numbers.update( + {'signatories[' + str(index) + '][' + str(key) + ']': val} + ) data = sig_numbers