66
77class Error (Exception ): # pragma: no cover
88 """Base exception class for this module"""
9+
910 def __init__ (self , msg , cause = None ):
1011 super (Error , self ).__init__ (msg )
1112 self ._cause = cause
@@ -37,41 +38,37 @@ def call_api(self, method, type='GET', params=None): # pragma: no cover
3738
3839 url = 'https://' + self .end_point + '/' + method
3940
40- headers = {'X-Auth-Token' : self .auth_token ,
41- 'X-Consumer-Token' : self .consumer_token ,
42- 'Content-Type' : 'application/json' }
41+ headers = {
42+ 'X-Auth-Token' : self .auth_token ,
43+ 'X-Consumer-Token' : self .consumer_token ,
44+ 'Content-Type' : 'application/json'
45+ }
4346
4447 # remove token from log
4548 headers_str = str (headers ).replace (self .auth_token .strip (), 'TOKEN' )
46- self ._log .debug ('%s %s %s %s' %
47- (type , url , params , headers_str ))
49+ self ._log .debug ('%s %s %s %s' % (type , url , params , headers_str ))
4850 try :
4951 if type == 'GET' :
5052 url = url + '%s' % self ._parse_params (params )
5153 resp = requests .get (url , headers = headers )
5254 elif type == 'POST' :
53- resp = requests .post (url , headers = headers ,
54- data = json .dumps (params ))
55+ resp = requests .post (url , headers = headers , data = json .dumps (params ))
5556 elif type == 'DELETE' :
5657 resp = requests .delete (url , headers = headers )
5758 elif type == 'PATCH' :
58- resp = requests .patch (url , headers = headers ,
59- data = json .dumps (params ))
59+ resp = requests .patch (url , headers = headers , data = json .dumps (params ))
6060 else :
61- raise Error (
62- 'method type not recognized as one of GET, POST, DELETE or PATCH: %s' % type
63- )
61+ raise Error ('method type not recognized as one of GET, POST, DELETE or PATCH: %s' % type )
6462 except requests .exceptions .RequestException as e :
6563 raise Error ('Communcations error: %s' % str (e ), e )
64+
6665 if not resp .content :
6766 data = None
6867 elif resp .headers .get ("content-type" , "" ).startswith ("application/json" ):
6968 try :
7069 data = resp .json ()
7170 except ValueError as e :
72- raise JSONReadError (
73- 'Read failed: %s' % e .message , e
74- )
71+ raise JSONReadError ('Read failed: %s' % e .message , e )
7572 else :
7673 data = resp .content
7774
@@ -81,20 +78,20 @@ def call_api(self, method, type='GET', params=None): # pragma: no cover
8178 msg = "(empty response)"
8279 elif 'errors' in data :
8380 msg = ', ' .join (data ['errors' ])
84- raise Error (
85- 'Error {0}: {1}' .format (resp .status_code , msg )
86- )
81+ raise Error ('Error {0}: {1}' .format (resp .status_code , msg ))
82+
8783 try :
8884 resp .raise_for_status ()
8985 except requests .HTTPError as e :
90- raise Error ('Error {0}: {1}' .format (resp .status_code ,
91- resp . reason ), e )
86+ raise Error ('Error {0}: {1}' .format (resp .status_code , resp . reason ), e )
87+
9288 self .meta = None
9389 try :
9490 if data and data ['meta' ]:
9591 self .meta = data ['meta' ]
9692 except (KeyError , IndexError ):
9793 pass
94+
9895 return data
9996
10097 def _parse_params (self , params ): # pragma: no cover
0 commit comments