smartystreets-python-sdk 6.2.0__tar.gz → 6.2.1__tar.gz

{smartystreets_python_sdk-6.2.0 → smartystreets_python_sdk-6.2.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: smartystreets_python_sdk
-Version: 6.2.0
+Version: 6.2.1
 Summary: An official library to help Python developers easily access the SmartyStreets APIs
 Home-page: https://github.com/smartystreets/smartystreets-python-sdk
-Download-URL: https://github.com/smartystreets/smartystreets-python-sdk/tarball/6.2.0
+Download-URL: https://github.com/smartystreets/smartystreets-python-sdk/tarball/6.2.1
 Author: SmartyStreets SDK Team
 Author-email: support@smartystreets.com
 License: Apache 2

{smartystreets_python_sdk-6.2.0 → smartystreets_python_sdk-6.2.1}/smartystreets_python_sdk/status_code_sender.py

@@ -8,18 +8,7 @@ class StatusCodeSender:
         self.inner = inner
 
     def parse_rate_limit_response(self, response):
-        error_message = exceptions.TooManyRequestsError(errors.TOO_MANY_REQUESTS)
-        response_json = json.loads(response.payload)
-        if response_json is not None:
-            errors_json = response_json.get('errors')
-            if errors_json is not None:
-                message = ''
-                for current_error in errors_json:
-                    current_message = current_error.get('message')
-                    if current_message is not None:
-                        message = message + current_message + ' '
-                error_message = exceptions.TooManyRequestsError(message.rstrip())
-        return error_message
+        return messageFrom(response, exceptions.TooManyRequestsError(errors.TOO_MANY_REQUESTS))
 
     def send(self, request):
         response = self.inner.send(request)
@@ -29,11 +18,38 @@ class StatusCodeSender:
                 response.error = exceptions.NotModifiedError(errors.NOT_MODIFIED, response.find_header('etag'))
             elif response.status_code == 429:
                 response.error = self.parse_rate_limit_response(response)
+            elif response.status_code in [400, 401, 402, 403, 413, 422]:
+                response.error = messageFrom(response, statuses.get(response.status_code))
             else:
                 response.error = statuses.get(response.status_code)
 
         return response
 
+def messageFrom(response, fallback):
+    message = extract_message(response)
+    if message:
+        return type(fallback)(message)
+    else:
+        return fallback
+
+
+def extract_message(response):
+    try:
+        response_json = json.loads(response.payload)
+    except (ValueError, TypeError):
+        return ''
+    if response_json is None:
+        return ''
+    errors_json = response_json.get('errors')
+    if errors_json is None:
+        return ''
+    message = ''
+    for current_error in errors_json:
+        current_message = current_error.get('message')
+        if current_message is not None:
+            message = message + current_message + ' '
+    return message.rstrip()
+
 
 def ok():
     return None

{smartystreets_python_sdk-6.2.0 → smartystreets_python_sdk-6.2.1}/smartystreets_python_sdk.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: smartystreets_python_sdk
-Version: 6.2.0
+Version: 6.2.1
 Summary: An official library to help Python developers easily access the SmartyStreets APIs
 Home-page: https://github.com/smartystreets/smartystreets-python-sdk
-Download-URL: https://github.com/smartystreets/smartystreets-python-sdk/tarball/6.2.0
+Download-URL: https://github.com/smartystreets/smartystreets-python-sdk/tarball/6.2.1
 Author: SmartyStreets SDK Team
 Author-email: support@smartystreets.com
 License: Apache 2

{smartystreets_python_sdk-6.2.0 → smartystreets_python_sdk-6.2.1}/smartystreets_python_sdk_version/__init__.py

@@ -1,2 +1,2 @@
 __version__ = '0.0.0'  # DO NOT EDIT (this is updated by a build job when a new release is published)
-__version__="6.2.0"
+__version__="6.2.1"