@@ -277,8 +277,7 @@ def renew_token(self):
277277 "client_secret" : self ._clientSecret
278278 }
279279 resp = postRequest ("authentication" , _AUTH_REQ , postParams )
280- if not resp :
281- raise AuthFailure ("Authentication Error from server." )
280+
282281 if self .refreshToken != resp ['refresh_token' ]:
283282 self .refreshToken = resp ['refresh_token' ]
284283 cred = {"CLIENT_ID" :self ._clientId ,
@@ -304,9 +303,8 @@ def __init__(self, authData):
304303 postParams = {
305304 "access_token" : authData .accessToken
306305 }
307- resp = postRequest ("Weather station User" , _GETSTATIONDATA_REQ , postParams )
308- if not resp :
309- raise AuthFailure ("No response received from server." )
306+ resp = postRequest ("Station User" , _GETSTATIONDATA_REQ , postParams )
307+
310308 self .rawData = resp ['body' ]
311309 self .devList = self .rawData ['devices' ]
312310 self .ownerMail = self .rawData ['user' ]['mail' ]
@@ -335,8 +333,7 @@ def __init__(self, authData, home_id):
335333 "home_id" : home_id
336334 }
337335 resp = postRequest ("home_status" , _HOME_STATUS , postParams )
338- if not resp :
339- raise AuthFailure ("No response received from server." )
336+
340337 self .resp = resp
341338 self .rawData = resp ['body' ]['home' ]
342339 if not self .rawData : raise NoHome ("No home %s found" % home_id )
@@ -395,8 +392,7 @@ def __init__(self, authData, home=None):
395392 "access_token" : self .getAuthToken
396393 }
397394 resp = postRequest ("Thermostat" , _GETTHERMOSTATDATA_REQ , postParams )
398- if not resp :
399- raise AuthFailure ("No response received from server." )
395+
400396 self .rawData = resp ['body' ]['devices' ]
401397 if not self .rawData : raise NoDevice ("No thermostat available" )
402398 #
@@ -493,8 +489,7 @@ def __init__(self, authData, home=None, station=None):
493489 "access_token" : self .getAuthToken
494490 }
495491 resp = postRequest ("Weather station" , _GETSTATIONDATA_REQ , postParams )
496- if not resp :
497- raise AuthFailure ("No response received from server." )
492+
498493 self .rawData = resp ['body' ]['devices' ]
499494 # Weather data
500495 if not self .rawData : raise NoDevice ("No weather station in any homes" )
@@ -680,8 +675,7 @@ def __init__(self, authData, home=None):
680675 "access_token" : self .getAuthToken
681676 }
682677 resp = postRequest ("Home data" , _GETHOMEDATA_REQ , postParams )
683- if not resp :
684- raise AuthFailure ("No response received from server." )
678+
685679 self .rawData = resp ['body' ]
686680 # Collect homes
687681 self .homes = self .rawData ['homes' ][0 ]
@@ -794,8 +788,7 @@ def cameraUrls(self, camera=None, home=None, cid=None):
794788 if camera_data :
795789 vpn_url = camera_data ['vpn_url' ]
796790 resp = postRequest ("Camera" , vpn_url + '/command/ping' )
797- if not resp :
798- raise AuthFailure ("No response received from server." )
791+
799792 temp_local_url = resp ['local_url' ]
800793 try :
801794 resp = postRequest ("Camera" , temp_local_url + '/command/ping' ,timeout = 1 )
@@ -834,8 +827,7 @@ def getCameraPicture(self, image_id, key):
834827 "key" : key
835828 }
836829 resp = postRequest ("Camera" , _GETCAMERAPICTURE_REQ , postParams )
837- if not resp :
838- raise AuthFailure ("No response received from server." )
830+
839831 return resp , "jpeg"
840832
841833 def getProfileImage (self , name ):
@@ -869,8 +861,7 @@ def updateEvent(self, event=None, home=None):
869861 "event_id" : event ['id' ]
870862 }
871863 resp = postRequest ("Camera" , _GETEVENTSUNTIL_REQ , postParams )
872- if not resp :
873- raise AuthFailure ("No response received from server." )
864+
874865 eventList = resp ['body' ]['events_list' ]
875866 for e in eventList :
876867 self .events [ e ['camera_id' ] ][ e ['time' ] ] = e
@@ -1012,8 +1003,7 @@ def __init__(self, authData, home=None):
10121003 }
10131004 #
10141005 resp = postRequest ("Module" , _GETHOMES_DATA , postParams )
1015- if not resp :
1016- raise AuthFailure ("No response received from server." )
1006+
10171007# self.rawData = resp['body']['devices']
10181008 self .rawData = resp ['body' ]['homes' ]
10191009 if not self .rawData : raise NoHome ("No home %s found" % home )
@@ -1051,8 +1041,7 @@ def __init__(self, authData):
10511041 "access_token" : self .getAuthToken
10521042 }
10531043 resp = postRequest ("HomeCoach" , _GETHOMECOACH , postParams )
1054- if not resp :
1055- raise AuthFailure ("No response received from server." )
1044+
10561045 self .rawData = resp ['body' ]['devices' ]
10571046 # homecoach data
10581047 if not self .rawData : raise NoDevice ("No HomeCoach available" )
@@ -1100,8 +1089,7 @@ def rawAPI(authData, url, parameters=None):
11001089 if parameters is None : parameters = {}
11011090 parameters ["access_token" ] = authData .accessToken
11021091 resp = postRequest ("rawAPI" , fullUrl , parameters )
1103- if not resp :
1104- raise AuthFailure ("No response received from server." )
1092+
11051093 return resp ["body" ] if "body" in resp else resp
11061094
11071095def filter_home_data (rawData , home ):
0 commit comments