Merge pull request #495 from kyleknap/empty-structure-s3

Fix issue with rest-xml serialization
boto · Mar 24, 2015 · 54c4615 · 54c4615
2 parents c7ad6a8 + 4cd5a43
commit 54c4615
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/botocore/serialize.py b/botocore/serialize.py
@@ -445,7 +445,7 @@ def _serialize_payload(self, partitioned, parameters,
             # If there's a payload member, we serialized that
             # member to they body.
             body_params = parameters.get(payload_member)
-            if body_params:
+            if body_params is not None:
                 serialized['body'] = self._serialize_body_params(
                     body_params,
                     shape_members[payload_member])

diff --git a/tests/unit/protocols/input/rest-xml.json b/tests/unit/protocols/input/rest-xml.json
@@ -855,6 +855,48 @@
           "body": "",
           "uri": "/"
         }
+      },
+      {
+        "given": {
+          "http": {
+            "method": "POST",
+            "requestUri": "/"
+          },
+          "input": {
+            "shape": "InputShape",
+            "payload": "foo"
+          },
+          "name": "OperationName"
+        },
+        "params": {
+          "foo": {}
+        },
+        "serialized": {
+          "method": "POST",
+          "body": "<foo />",
+          "uri": "/"
+        }
+      },
+      {
+        "given": {
+          "http": {
+            "method": "POST",
+            "requestUri": "/"
+          },
+          "input": {
+            "shape": "InputShape",
+            "payload": "foo"
+          },
+          "name": "OperationName"
+        },
+        "params": {
+          "foo": null
+        },
+        "serialized": {
+          "method": "POST",
+          "body": "",
+          "uri": "/"
+        }
       }
     ]
   },