Parse empty XML string nodes as an empty Python string

This changes the output of the XML-based parsers and adds protocol tests for each of `query`, `ec2`, and `rest-xml`. This is required to support new waiters as in aws/aws-cli#1252.
boto · Mar 31, 2015 · e134d9a · e134d9a
1 parent fbbc94d
commit e134d9a
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 5 deletions.
diff --git a/botocore/parsers.py b/botocore/parsers.py
@@ -428,11 +428,6 @@ def _inject_response_metadata(self, node, inject_into):
                 sub_mapping[key] = value.text
             inject_into['ResponseMetadata'] = sub_mapping
 
-    def _handle_string(self, shape, node):
-        return node.text
-
-    _handle_character = _handle_string
-
 
 class EC2QueryParser(QueryParser):
 

diff --git a/tests/unit/protocols/output/ec2.json b/tests/unit/protocols/output/ec2.json
@@ -413,5 +413,42 @@
         }
       }
     ]
+  },
+  {
+    "description": "Empty string",
+    "metadata": {
+      "protocol": "ec2"
+    },
+    "shapes": {
+      "OutputShape": {
+        "type": "structure",
+        "members": {
+          "Foo": {
+            "shape": "StringType"
+          }
+        }
+      },
+      "StringType": {
+        "type": "string"
+      }
+    },
+    "cases": [
+      {
+        "given": {
+          "output": {
+            "shape": "OutputShape"
+          },
+          "name": "OperationName"
+        },
+        "result": {
+          "Foo": ""
+        },
+        "response": {
+          "status_code": 200,
+          "headers": {},
+          "body": "<OperationNameResponse><Foo/><RequestId>requestid</RequestId></OperationNameResponse>"
+        }
+      }
+    ]
   }
 ]
diff --git a/tests/unit/protocols/output/query.json b/tests/unit/protocols/output/query.json
@@ -772,5 +772,42 @@
         }
       }
     ]
+  },
+  {
+    "description": "Empty string",
+    "metadata": {
+      "protocol": "query"
+    },
+    "shapes": {
+      "OutputShape": {
+        "type": "structure",
+        "members": {
+          "Foo": {
+            "shape": "StringType"
+          }
+        }
+      },
+      "StringType": {
+        "type": "string"
+      }
+    },
+    "cases": [
+      {
+        "given": {
+          "output": {
+            "shape": "OutputShape"
+          },
+          "name": "OperationName"
+        },
+        "result": {
+          "Foo": ""
+        },
+        "response": {
+          "status_code": 200,
+          "headers": {},
+          "body": "<OperationNameResponse><Foo/><RequestId>requestid</RequestId></OperationNameResponse>"
+        }
+      }
+    ]
   }
 ]
diff --git a/tests/unit/protocols/output/rest-xml.json b/tests/unit/protocols/output/rest-xml.json
@@ -679,5 +679,42 @@
         }
       }
     ]
+  },
+  {
+    "description": "Empty string",
+    "metadata": {
+      "protocol": "rest-xml"
+    },
+    "shapes": {
+      "OutputShape": {
+        "type": "structure",
+        "members": {
+          "Foo": {
+            "shape": "StringType"
+          }
+        }
+      },
+      "StringType": {
+        "type": "string"
+      }
+    },
+    "cases": [
+      {
+        "given": {
+          "output": {
+            "shape": "OutputShape"
+          },
+          "name": "OperationName"
+        },
+        "result": {
+          "Foo": ""
+        },
+        "response": {
+          "status_code": 200,
+          "headers": {},
+          "body": "<OperationNameResponse><Foo/><RequestId>requestid</RequestId></OperationNameResponse>"
+        }
+      }
+    ]
   }
 ]