Minor fix for APIError exception

Author: Shiyue Cheng

meraki/__init__.py

@@ -85,7 +85,7 @@
     MAXIMUM_RETRIES, OUTPUT_LOG, LOG_PATH, LOG_FILE_PREFIX, PRINT_TO_CONSOLE, SIMULATE_API_CALLS
 )
 
-__version__ = '0.90.0'
+__version__ = '0.90.1'
 
 class DashboardAPI(object):
     """

meraki/api/devices.py

@@ -59,7 +59,7 @@ def claimNetworkDevices(self, networkId: str, **kwargs):
         }
         resource = f'/networks/{networkId}/devices/claim'
 
-        body_params = ['serials', 'serial', 'serials']
+        body_params = ['serials', 'serial']
         payload = {k: v for (k, v) in kwargs.items() if k in body_params}
 
         return self._session.post(metadata, resource, payload)

meraki/exceptions.py

@@ -14,10 +14,10 @@ def __init__(self, metadata, response):
         self.response = response
         self.tag = metadata['tags'][0]
         self.operation = metadata['operation']
-        self.status = self.response.status_code if self.response else None
-        self.reason = self.response.reason if self.response else None
+        self.status = self.response.status_code if self.response.status_code else None
+        self.reason = self.response.reason if self.response.reason else None
         try:
-            self.message = self.response.json() if self.response else None
+            self.message = self.response.json() if self.response.json() else None
         except ValueError:
             self.message = self.response.text[:100]
         super(APIError, self).__init__(f'{self.tag}, {self.operation} - {self.status} {self.reason}, {self.message}')
@@ -31,9 +31,12 @@ def __init__(self, metadata, response, message):
         self.response = response
         self.tag = metadata['tags'][0]
         self.operation = metadata['operation']
-        self.status = self.response.status if self.response else None
-        self.reason = self.response.reason if self.response else None
-        self.message = message[:100]
+        self.status = self.response.status if self.response.status else None
+        self.reason = self.response.reason if self.response.reason else None
+        try:
+            self.message = self.response.json() if self.response.json() else None
+        except ValueError:
+            self.message = self.response.text[:100]
         super().__init__(
             f'{self.tag}, {self.operation} - {self.status} {self.reason}, {self.message}'
         )