HTTPError handling

Author: kasemir

scan/client/scanclient.py

@@ -113,7 +113,13 @@ def perform_request(url, method='GET', data=None, timeout=None):
         try:
             response.raise_for_status()
         except requests.HTTPError as e:
-            raise Exception("Scan server at %s returned error code %d" % (url, e.response.code))
+            msg = "Scan server at %s returned error" % url
+            if hasattr(e, 'response'):
+                if hasattr(e.response, 'status_code'):
+                    msg += " code %d" % e.response.status_code
+                if hasattr(e.response, '_content'):
+                    msg += "\n" + e.response._content
+            raise Exception(msg)
 
         return response.text
 

scan/version.py

@@ -1,8 +1,9 @@
 from __future__ import print_function
 
-__version__ = '1.8.0'
+__version__ = '1.8.1'
 
 version_history = """
+1.8.1 - Fix error in requests.HTTPError handling
 1.8.0 - Set command with 'readback_value'
 1.7.0 - CommandSequence class inherits from list
 1.6.0 - Add support for Python3, CPython uses requests library