Skip to content

Commit a8ddd93

Browse files
committed
Fixed json_result unavailable error
1 parent 8947b59 commit a8ddd93

1 file changed

Lines changed: 9 additions & 17 deletions

File tree

cloudconvert/api.py

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -146,35 +146,27 @@ def rawCall(self, method, path, content=None, is_authenticated=False, stream=Fal
146146

147147
code = result.status_code
148148

149-
150-
# attempt to decode and return the response
151-
152-
if not stream:
153-
try:
154-
json_result = result.json()
155-
except ValueError as error:
156-
raise InvalidResponse("Failed to decode API response", error)
157-
158-
159149
# error check
160150
if code >= 100 and code < 300:
161151
if stream:
162152
return result
163-
else:
164-
return json_result
153+
154+
try:
155+
return result.json()
156+
except ValueError as error:
157+
raise InvalidResponse("Failed to decode API response", error)
165158
else:
159+
json_result = result.json()
166160
msg = json_result.get('message') if json_result.get('message') else json_result.get('error')
167161
if code == 400:
168-
raise BadRequest(msg)
162+
raise BadRequest(msg)
169163
elif code == 422:
170-
raise ConversionFailed(msg)
164+
raise ConversionFailed(msg)
171165
elif code == 503:
172-
raise TemporaryUnavailable(msg)
166+
raise TemporaryUnavailable(msg)
173167
else:
174168
raise APIError(msg)
175169

176-
177-
178170
def createProcess(self, parameters):
179171
"""
180172
Create a new Process

0 commit comments

Comments
 (0)