Skip to content

Commit 4475b61

Browse files
authored
Merge pull request #187 from Onebrownsound/api-2663
Ward off unexpected missing properties when handling exceptions
2 parents 0675bf8 + ea52148 commit 4475b61

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

vimeo/exceptions.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,22 @@ class BaseVimeoException(Exception):
66

77
def __get_message(self, response):
88
if type(response) is Exception:
9-
return response.message
9+
default_message = 'There was an unexpected error'
10+
return response.message if response.message is not None else default_message
1011

1112
json = None
1213
try:
1314
json = response.json()
1415
except Exception:
1516
pass
1617

18+
message = None
1719
if json:
1820
message = json.get('error') or json.get('Description')
1921
elif hasattr(response, 'text'):
2022
response_message = getattr(response, 'message', 'There was an unexpected error.')
2123
message = getattr(response, 'text', response_message)
22-
else:
24+
elif hasattr(response, 'message')::
2325
message = getattr(response, 'message')
2426

2527
return message

0 commit comments

Comments
 (0)