Merge branch 'takumn-fix-structured-xml-label' into develop

* takumn-fix-structured-xml-label:
  Add unittest for #196
  Choose proper XML label for structured payload

botocore/parameters.py

@@ -399,7 +399,7 @@ def to_xml(self, value, label=None):
  inner_xml = ''
  for item in value:
  xmlname = self.xmlname
- if not xmlname:
+ if self.members.xmlname:
  xmlname = self.members.xmlname
  inner_xml += self.members.to_xml(item, xmlname)
  if self.flattened:
@@ -565,7 +565,7 @@ def to_xml(self, value, label=None):
  xml += '>'
  for member in self.members:
  if member.name in value and not hasattr(member, 'xmlattribute'):
- xml += member.to_xml(value[member.name], member.name)
+ xml += member.to_xml(value[member.name], member.get_label())
  xml += '</%s>' % label
  return xml
 

tests/unit/test_s3_operations.py

@@ -58,6 +58,14 @@
  '<Status>Enabled</Status><Transition><Days>0</Days>'
  '<StorageClass>GLACIER</StorageClass></Transition></Rule>'
  '</LifecycleConfiguration>')
+PUT_OBJECT_ACL = (
+ '<AccessControlPolicy><AccessControlList>'
+ '<Grant><Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" '
+ 'xsi:type="CanonicalUser"><DisplayName>name</DisplayName><ID>myid</ID>'
+ '</Grantee><Permission>FULL_CONTROL</Permission></Grant></AccessControlList>'
+ '<Owner><DisplayName>name</DisplayName><ID>myid</ID>'
+ '</Owner></AccessControlPolicy>')
+
 
 POLICY = ('{"Version": "2008-10-17","Statement": [{"Sid": "AddPerm",'
  '"Effect": "Allow","Principal": {"AWS": "*"},'
@@ -323,3 +331,26 @@ def test_complete_multipart_upload(self):
  # Explicitly check that <Parts> is not in the payload anywhere.
  self.assertNotIn('<Parts>', xml_payload)
  self.assertNotIn('</Parts>', xml_payload)
+
+ def test_put_object_acl(self):
+ op = self.s3.get_operation('PutObjectAcl')
+ params = op.build_parameters(
+ bucket=self.bucket_name, key=self.key_name,
+ access_control_policy={
+ "Owner": {
+ "DisplayName": "name",
+ "ID": "myid"
+ },
+ "Grants": [
+ {
+ "Grantee": {
+ "DisplayName": "name",
+ "Type": "CanonicalUser",
+ "ID": "myid"
+ },
+ "Permission": "FULL_CONTROL"
+ }
+ ]
+ })
+ xml_payload = params['payload'].getvalue()
+ self.assertEqual(xml_payload, PUT_OBJECT_ACL)