Fix unexpected attribute error

google · Oct 1, 2020 · 087ac0b · 087ac0b
1 parent ca20945
commit 087ac0b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/apitools/base/protorpclite/protojson.py b/apitools/base/protorpclite/protojson.py
@@ -333,7 +333,10 @@ def decode_field(self, field, value):
 
         elif (isinstance(field, messages.MessageField) and
               issubclass(field.type, messages.Message)):
-            return self.__decode_dictionary(field.type, value)
+            try:
+                return self.__decode_dictionary(field.type, value)
+            except AttributeError as err:
+                raise messages.DecodeError(err)
 
         elif (isinstance(field, messages.FloatField) and
               isinstance(value, (six.integer_types, six.string_types))):

diff --git a/apitools/base/protorpclite/protojson_test.py b/apitools/base/protorpclite/protojson_test.py
@@ -374,13 +374,20 @@ def testDecodeInvalidDateTime(self):
                           MyMessage, '{"a_datetime": "invalid"}')
 
     def testDecodeInvalidMessage(self):
-        encoded = """{
-        "a_nested_datetime": {
-          "nested_dt_value": "invalid"
-          }
-        }
-        """
-        self.assertRaises(messages.DecodeError, protojson.decode_message,
+        for encoded in (
+            """{
+            "a_nested_datetime": {
+              "nested_dt_value": "invalid"
+              }
+            }
+            """,
+            """{
+            "a_nested_array": [{
+              "an_integer": 1
+              }]
+            }
+            """):
+            self.assertRaises(messages.DecodeError, protojson.decode_message,
                           MyMessage, encoded)
 
     def testEncodeDateTime(self):