Merge branch 'release-0.60.0'

* release-0.60.0: Bumping version to 0.60.0 Updated models to the latest version. Add unittest for #196 Choose proper XML label for structured payload
boto · Aug 7, 2014 · 6a8e232 · 6a8e232
2 parents 2009842 + 34c8282
commit 6a8e232
Show file tree

Hide file tree

Showing 7 changed files with 396 additions and 361 deletions.
diff --git a/botocore/__init__.py b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '0.59.0'
+__version__ = '0.60.0'
 
 
 class NullHandler(logging.Handler):

diff --git a/botocore/data/aws/cognito-identity/2014-06-30.json b/botocore/data/aws/cognito-identity/2014-06-30.json
diff --git a/botocore/data/aws/emr/2009-03-31.json b/botocore/data/aws/emr/2009-03-31.json
@@ -9,7 +9,7 @@
     "timestamp_format": "unixTimestamp",
     "endpoint_prefix": "elasticmapreduce",
     "xmlnamespace": "http://elasticmapreduce.amazonaws.com/doc/2009-03-31",
-    "documentation": "\n      <p> This is the <i>Amazon Elastic MapReduce API Reference</i>. This guide provides descriptions and\n         samples of the Amazon Elastic MapReduce APIs.</p>\n\n      <p>Amazon Elastic MapReduce (Amazon EMR) is a web service that makes it easy to process large amounts of\n         data efficiently. Amazon EMR uses Hadoop processing combined with several AWS\n         products to do tasks such as web indexing, data mining, log file analysis, machine\n         learning, scientific simulation, and data warehousing.</p>\n\n   ",
+    "documentation": "\n\n      <p>Amazon Elastic MapReduce (Amazon EMR) is a web service that makes it easy to process large amounts of\n         data efficiently. Amazon EMR uses Hadoop processing combined with several AWS\n         products to do tasks such as web indexing, data mining, log file analysis, machine\n         learning, scientific simulation, and data warehousing.</p>\n\n   ",
     "operations": {
         "AddInstanceGroups": {
             "name": "AddInstanceGroups",
@@ -588,7 +588,7 @@
                             "ServiceRole": {
                                 "shape_name": "String",
                                 "type": "string",
-                                "documentation": "\n      <p>The IAM role that was specified when the job flow was launched. Amazon ElasticMapReduce will assume this role to work with AWS resources on your behalf.</p>\n   "
+                                "documentation": "\n      <p>The IAM role that will be assumed by the Amazon EMR service to access AWS resources on your behalf.</p>\n   "
                             }
                         },
                         "documentation": "\n      <p>This output contains the details for the requested cluster.</p>\n   "
@@ -1252,7 +1252,7 @@
                                     "pattern": "[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\r\\n\\t]*",
                                     "min_length": 0,
                                     "max_length": 10280,
-                                    "documentation": "\n      <p>The IAM role that was specified when the job flow was launched. Amazon ElasticMapReduce will assume this role to work with AWS resources on your behalf.</p>\n   "
+                                    "documentation": "\n      <p>The IAM role that will be assumed by the Amazon EMR service to access AWS resources on your behalf.</p>\n   "
                                 }
                             },
                             "documentation": "\n      <p> A description of a job flow.</p>\n   "
@@ -2858,7 +2858,7 @@
                         "pattern": "[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\r\\n\\t]*",
                         "min_length": 0,
                         "max_length": 10280,
-                        "documentation": "\n      <p>IAM role that Amazon ElasticMapReduce will assume to work with AWS resources on your behalf. You may set this parameter to the name of an existing IAM role.</p>\n   "
+                        "documentation": "\n      <p>The IAM role that will be assumed by the Amazon EMR service to access AWS resources on your behalf.</p>\n   "
                     },
                     "Tags": {
                         "shape_name": "TagList",

diff --git a/botocore/parameters.py b/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