Fallback to Message if message is missing from response (#872)

samhandev · web-flow · commit acbeb41c1915 · 2020-11-02T10:01:57.000-05:00
Works around dynamodb-local inconsistency of using 'message' key instead of 'Message' key.
diff --git a/pynamodb/connection/base.py b/pynamodb/connection/base.py
@@ -421,7 +421,7 @@ def _make_api_call(self, operation_name, operation_kwargs):
                 code = data.get('__type', '')
                 if '#' in code:
                     code = code.rsplit('#', 1)[1]
-                botocore_expected_format = {'Error': {'Message': data.get('message', ''), 'Code': code}}
+                botocore_expected_format = {'Error': {'Message': data.get('message', '') or data.get('Message', ''), 'Code': code}}
                 verbose_properties = {
                     'request_id': headers.get('x-amzn-RequestId')
                 }

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ def _make_api_call(self, operation_name, operation_kwargs):`
`421`	`421`	`code = data.get('__type', '')`
`422`	`422`	`if '#' in code:`
`423`	`423`	`code = code.rsplit('#', 1)[1]`
`424`		`- botocore_expected_format = {'Error': {'Message': data.get('message', ''), 'Code': code}}`
	`424`	`+ botocore_expected_format = {'Error': {'Message': data.get('message', '') or data.get('Message', ''), 'Code': code}}`
`425`	`425`	`verbose_properties = {`
`426`	`426`	`'request_id': headers.get('x-amzn-RequestId')`
`427`	`427`	`}`