Skip to content

Add support for None values in list parsing #3618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adev-code wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add support for None values in list parsing #3618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion botocore/parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,10 @@ def _handle_list(self, shape, node):
parsed = []
member_shape = shape.member
for item in node:
parsed.append(self._parse_shape(member_shape, item))
if item is None:
parsed.append(None)
else:
parsed.append(self._parse_shape(member_shape, item))
return parsed

def _default_handle(self, shape, value):
Expand Down
53 changes: 53 additions & 0 deletions tests/unit/test_parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1646,3 +1646,56 @@ def test_can_handle_generic_error_message(parser, body):
)
assert parsed['Error'] == {'Code': '503', 'Message': 'Service Unavailable'}
assert parsed['ResponseMetadata']['HTTPStatusCode'] == 503


class TestNullInListParsing(unittest.TestCase):
def test_handles_null_in_list(self):
parser = parsers.JSONParser()
body = b'{"items":[1,null,3]}'
output_shape = model.StructureShape(
'OutputShape',
{'type': 'structure', 'members': {'items': {'shape': 'ItemList'}}},
model.ShapeResolver(
{
'ItemList': {
'type': 'list',
'member': {'shape': 'ItemType'},
},
'ItemType': {'type': 'integer'},
}
),
)
parsed = parser.parse(
{'body': body, 'headers': {}, 'status_code': 200}, output_shape
)
self.assertEqual(parsed['items'], [1, None, 3])

def test_handles_null_in_nested_list(self):
parser = parsers.RestJSONParser()
body = b'{"data":[[{"values":[1,null,3]}]]}'
output_shape = model.StructureShape(
'OutputShape',
{'type': 'structure', 'members': {'data': {'shape': 'DataList'}}},
model.ShapeResolver(
{
'DataList': {
'type': 'list',
'member': {'shape': 'ItemList'},
},
'ItemList': {'type': 'list', 'member': {'shape': 'Item'}},
'Item': {
'type': 'structure',
'members': {'values': {'shape': 'ValueList'}},
},
'ValueList': {
'type': 'list',
'member': {'shape': 'ValueType'},
},
'ValueType': {'type': 'integer'},
}
),
)
parsed = parser.parse(
{'body': body, 'headers': {}, 'status_code': 200}, output_shape
)
self.assertEqual(parsed['data'][0][0]['values'], [1, None, 3])