Skip to content

Commit d1d694c

Browse files
committed
Merge remote-tracking branch 'origin/master' into feat/nb35
# Conflicts: # CHANGES.md # pack.yaml
2 parents 8b6524f + f9ee248 commit d1d694c

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

CHANGES.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
## 3.1.0
44

5-
- Updated spec as per v3.5.0
5+
- Updated spec as per v3.5.9
6+
7+
## 3.0.6
8+
9+
- Add exceptions on action.py
610

711
## 3.0.5
812

actions/lib/action.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,9 @@ def make_request(self, endpoint_uri, http_action, **kwargs):
7373
)
7474

7575
if r:
76-
return {"raw": r.json(), "status": r.status_code}
76+
try:
77+
raw = r.json()
78+
except ValueError:
79+
raw = r.text
80+
return {"raw": raw, "status": r.status_code}
7781
return {"raw": {}, "status": 404}

0 commit comments

Comments
 (0)