Merge pull request #40 from khaddict/master

Add exceptions on action.py

Author: nzlosh

CHANGES.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 3.0.6
+
+- Add exceptions on action.py
+
 ## 3.0.5
 
 - Bug fix: Tags fields need additional translation when modifying 

actions/lib/action.py

@@ -73,5 +73,9 @@ def make_request(self, endpoint_uri, http_action, **kwargs):
             )
 
         if r:
-            return {"raw": r.json(), "status": r.status_code}
+            try:
+                raw = r.json()
+            except ValueError:
+                raw = r.text
+            return {"raw": raw, "status": r.status_code}
         return {"raw": {}, "status": 404}

pack.yaml

@@ -6,7 +6,7 @@ keywords:
   - networking
   - ipam
   - dcim
-version: 3.0.5
+version: 3.0.6
 author: John Anderson, Jefferson White
 email: [email protected]
 python_versions: