Merge pull request #99 from JuliaCloud/tan/misc

do not override `LightXML.get_elements_by_tagname`

src/AWS.jl

@@ -5,10 +5,6 @@ using Requests
 using JSON
 using LightXML
 using Compat
-import LightXML: get_elements_by_tagname
-
-# trying to get elements from nothing should result in nothing
-get_elements_by_tagname(::Void, s) = nothing
 
 const EP_US_EAST_NORTHERN_VIRGINIA     = "ec2.us-east-1.amazonaws.com"
 const EP_US_WEST_OREGON                = "ec2.us-west-2.amazonaws.com"
@@ -227,6 +223,10 @@ function get_instance_credentials()
     end
 end
 
+# trying to get elements from nothing should result in nothing
+elements_by_tagname(::Void, s) = nothing
+elements_by_tagname(node, s) = LightXML.get_elements_by_tagname(node, s)
+
 include("codegen.jl")
 include("aws_utils.jl")
 include("crypto.jl")

src/EC2.jl

@@ -6,9 +6,8 @@ using Requests
 using AWS.AWSEnv
 using AWS
 
-import AWS.xml
+import AWS: xml, elements_by_tagname
 import Base.show
-import LightXML: get_elements_by_tagname
 
 type EC2Error
     code::String

src/S3.jl

@@ -9,7 +9,7 @@ using Base.get
 
 using URIParser
 
-import AWS.xml
+import AWS: xml, elements_by_tagname
 
 include("s3_types.jl")
 

src/SQS.jl

@@ -7,6 +7,8 @@ using LightXML
 using AWS.AWSEnv
 using AWS
 
+import AWS: elements_by_tagname
+
 include("sqs_typed.jl")
 
 

src/autoscaling.jl

@@ -9,7 +9,6 @@ using Compat
 
 import AWS: xml, AbstractAWSType, _ename, parse_from_xml, prep_params
 import Base.show
-import LightXML: get_elements_by_tagname
 
 type AutoScalingError
     code::String

src/s3_types.jl

@@ -105,7 +105,7 @@ function BucketLoggingStatus(pd_bls)
         bls.targetPrefix = LightXML.content(LightXML.find_element(LightXML.find_element(pd_bls, "LoggingEnabled"), "TargetPrefix"))
 
         ## grants = LightXML.find_element(pd_bls, "LoggingEnabled/TargetGrants/Grant")
-        bls.targetGrants = AWS.@parse_vector(AWS.S3.Grant, LightXML.get_elements_by_tagname(LightXML.find_element(LightXML.find_element(pd_bls, "LoggingEnabled"), "TargetGrants"), "Grant"))
+        bls.targetGrants = AWS.@parse_vector(AWS.S3.Grant, elements_by_tagname(LightXML.find_element(LightXML.find_element(pd_bls, "LoggingEnabled"), "TargetGrants"), "Grant"))
     end
     bls
 end
@@ -133,7 +133,7 @@ end
 
 function AccessControlPolicy(pd_acl)
     owner = Owner(LightXML.find_element(pd_acl, "Owner"))
-    accessControlList = AWS.@parse_vector(AWS.S3.Grant, LightXML.get_elements_by_tagname(LightXML.find_element(pd_acl, "AccessControlList"), "Grant"))
+    accessControlList = AWS.@parse_vector(AWS.S3.Grant, elements_by_tagname(LightXML.find_element(pd_acl, "AccessControlList"), "Grant"))
     return AccessControlPolicy(owner, accessControlList)
 end
 
@@ -211,8 +211,8 @@ function ListBucketResult(pd_lbr)
     lbr.maxKeys = AWS.safe_parseint(LightXML.content(LightXML.find_element(pd_lbr, "MaxKeys")))
     lbr.delimiter = LightXML.find_element(pd_lbr, "Delimiter") != nothing ?LightXML.content(LightXML.find_element(pd_lbr, "Delimiter")) : ""
     lbr.isTruncated = AWS.safe_parsebool(LightXML.content(LightXML.find_element(pd_lbr, "IsTruncated")))
-    lbr.contents = AWS.@parse_vector(AWS.S3.Contents, LightXML.get_elements_by_tagname(pd_lbr, "Contents"))
-    lbr.commonPrefixes = AWS.@parse_vector(AWS.S3.CommonPrefixes, LightXML.get_elements_by_tagname(pd_lbr, "CommonPrefixes"))
+    lbr.contents = AWS.@parse_vector(AWS.S3.Contents, elements_by_tagname(pd_lbr, "Contents"))
+    lbr.commonPrefixes = AWS.@parse_vector(AWS.S3.CommonPrefixes, elements_by_tagname(pd_lbr, "CommonPrefixes"))
     lbr
 end
 export ListBucketResult
@@ -292,9 +292,9 @@ function ListVersionsResult(pd_lvr)
     lvr.maxKeys = AWS.safe_parseint(LightXML.content(LightXML.find_element(pd_lvr, "MaxKeys")))
     lvr.delimiter = LightXML.content(LightXML.find_element(pd_lvr, "Delimiter"))
     lvr.isTruncated = AWS.safe_parsebool(LightXML.content(LightXML.find_element(pd_lvr, "IsTruncated")))
-    lvr.version = AWS.@parse_vector(AWS.S3.Version, LightXML.get_elements_by_tagname(pd_lvr, "Version"))
-    lvr.deleteMarker = AWS.@parse_vector(AWS.S3.DeleteMarker, LightXML.get_elements_by_tagname(pd_lvr, "DeleteMarker"))
-    lvr.commonPrefixes = AWS.@parse_vector(AWS.S3.CommonPrefixes, LightXML.get_elements_by_tagname(pd_lvr, "CommonPrefixes"))
+    lvr.version = AWS.@parse_vector(AWS.S3.Version, elements_by_tagname(pd_lvr, "Version"))
+    lvr.deleteMarker = AWS.@parse_vector(AWS.S3.DeleteMarker, elements_by_tagname(pd_lvr, "DeleteMarker"))
+    lvr.commonPrefixes = AWS.@parse_vector(AWS.S3.CommonPrefixes, elements_by_tagname(pd_lvr, "CommonPrefixes"))
     lvr
 end
 export ListVersionsResult
@@ -322,7 +322,7 @@ type ListAllMyBucketsResult
 end
 function ListAllMyBucketsResult(pd_lab)
     owner = Owner(LightXML.find_element(pd_lab, "Owner"))
-    buckets = AWS.@parse_vector(AWS.S3.AWS.S3.Bucket, LightXML.get_elements_by_tagname(LightXML.find_element(pd_lab, "Buckets"), "Bucket"))
+    buckets = AWS.@parse_vector(AWS.S3.AWS.S3.Bucket, elements_by_tagname(LightXML.find_element(pd_lab, "Buckets"), "Bucket"))
     ListAllMyBucketsResult(owner, buckets)
 end
 export ListAllMyBucketsResult
@@ -396,7 +396,7 @@ export TopicConfiguration
 type NotificationConfiguration{T<:Union{Vector{TopicConfiguration}, Void}}
     topicConfiguration::T
 end
-NotificationConfiguration(pd) = NotificationConfiguration(AWS.@parse_vector(AWS.S3.TopicConfiguration, LightXML.get_elements_by_tagname(pd, "TopicConfiguration")))
+NotificationConfiguration(pd) = NotificationConfiguration(AWS.@parse_vector(AWS.S3.TopicConfiguration, elements_by_tagname(pd, "TopicConfiguration")))
 
 function xml(o::NotificationConfiguration)
     if o.topicConfiguration == nothing
@@ -502,7 +502,7 @@ function ListPartsResult(pd)
         LightXML.content(LightXML.find_element(pd, "NextPartNumberMarker")),
         int(LightXML.content(LightXML.find_element(pd, "MaxParts"))),
         (lowercase(LightXML.content(LightXML.find_element(pd, "IsTruncated"))) == "true") ? true : false,
-        AWS.@parse_vector(AWS.S3.Part, LightXML.get_elements_by_tagname(pd, "Part"))
+        AWS.@parse_vector(AWS.S3.Part, elements_by_tagname(pd, "Part"))
     )
 end
 export ListPartsResult
@@ -553,8 +553,8 @@ function ListMultipartUploadsResult(pd)
         AWS.safe_parseint(LightXML.content(LightXML.find_element(pd, "MaxUploads"))),
         LightXML.content(LightXML.find_element(pd, "Delimiter")),
         AWS.safe_parsebool(LightXML.content(LightXML.find_element(pd, "IsTruncated"))),
-        AWS.@parse_vector(AWS.S3.Upload, LightXML.get_elements_by_tagname(pd, "Upload")),
-        AWS.@parse_vector(AWS.S3.CommonPrefixes, LightXML.get_elements_by_tagname(pd, "CommonPrefixes"))
+        AWS.@parse_vector(AWS.S3.Upload, elements_by_tagname(pd, "Upload")),
+        AWS.@parse_vector(AWS.S3.CommonPrefixes, elements_by_tagname(pd, "CommonPrefixes"))
     )
 end
 export ListMultipartUploadsResult
@@ -579,12 +579,12 @@ xml(o::CORSRule) = xml("CORSRule", [
 
 function CORSRule(pd)
     id = LightXML.content(LightXML.find_element(pd, "ID"))
-    allowedMethod = parse_vector_as(String, "AllowedMethod", LightXML.get_elements_by_tagname(pd, "AllowedMethod"))
-    allowedOrigin = parse_vector_as(String, "AllowedOrigin", LightXML.get_elements_by_tagname(pd, "AllowedOrigin"))
-    allowedHeader = parse_vector_as(String, "AllowedHeader", LightXML.get_elements_by_tagname(pd, "AllowedHeader"))
+    allowedMethod = parse_vector_as(String, "AllowedMethod", elements_by_tagname(pd, "AllowedMethod"))
+    allowedOrigin = parse_vector_as(String, "AllowedOrigin", elements_by_tagname(pd, "AllowedOrigin"))
+    allowedHeader = parse_vector_as(String, "AllowedHeader", elements_by_tagname(pd, "AllowedHeader"))
     seconds = LightXML.content(LightXML.find_element(pd, "MaxAgeSeconds"))
     if (seconds != nothing) maxAgeSeconds = int(seconds) end
-    exposeHeader = parse_vector_as(String, "ExposeHeader", LightXML.get_elements_by_tagname(pd, "ExposeHeader"))
+    exposeHeader = parse_vector_as(String, "ExposeHeader", elements_by_tagname(pd, "ExposeHeader"))
 
     CORSRule(id, allowedMethod, allowedOrigin, allowedHeader, maxAgeSeconds, exposeHeader)
 
@@ -596,7 +596,7 @@ type CORSConfiguration{T<:Vector{CORSRule}}
     corsrules::T
 end
 xml(o::CORSConfiguration) = xml("CORSConfiguration", o.corsrules)
-CORSConfiguration(pd) = AWS.@parse_vector(AWS.S3.CORSRule, LightXML.get_elements_by_tagname(pd, "CORSRule"))
+CORSConfiguration(pd) = AWS.@parse_vector(AWS.S3.CORSRule, elements_by_tagname(pd, "CORSRule"))
 
 
 type S3Error
@@ -996,7 +996,7 @@ end
 DeleteResult() = DeleteResult(nothing, nothing)
 function DeleteResult(pd)
     dr = DeleteResult()
-    dr.deleted = LightXML.get_elements_by_tagname(pd, "Deleted") != nothing ? AWS.@parse_vector(AWS.S3.Deleted, LightXML.get_elements_by_tagname(pd, "Deleted")) : nothing
+    dr.deleted = elements_by_tagname(pd, "Deleted") != nothing ? AWS.@parse_vector(AWS.S3.Deleted, elements_by_tagname(pd, "Deleted")) : nothing
     dr.delete_errors = LightXML.find_element(pd, "Errors") != nothing ? AWS.@parse_vector(AWS.S3.DeleteError, LightXML.find_element(pd, "Errors")) : nothing
     dr
 end

src/sqs_types.jl

@@ -63,7 +63,7 @@ end
 function CreateQueueType(pd::LightXML.XMLElement)
     o = CreateQueueType()
     o.queueName = LightXML.content(LightXML.find_element(pd, "QueueName"))
-    o.attributeSet = AWS.@parse_vector(AWS.SQS.AttributeType, LightXML.get_elements_by_tagname(LightXML.find_element(pd, "Attribute")))
+    o.attributeSet = AWS.@parse_vector(AWS.SQS.AttributeType, elements_by_tagname(LightXML.find_element(pd, "Attribute")))
     o
 end
 
@@ -145,7 +145,7 @@ type ListQueuesResponseType
 end
 function ListQueuesResponseType(pd::LightXML.XMLElement)
     o = ListQueuesResponseType()
-    o.queueUrlSet = String[LightXML.content(url) for url in LightXML.get_elements_by_tagname(LightXML.find_element(pd, "ListQueuesResult"), "QueueUrl")]
+    o.queueUrlSet = String[LightXML.content(url) for url in elements_by_tagname(LightXML.find_element(pd, "ListQueuesResult"), "QueueUrl")]
     o.requestId = LightXML.content(LightXML.find_element(LightXML.find_element(pd, "ResponseMetadata"), "RequestId"))
     o
 end
@@ -226,7 +226,7 @@ type GetQueueAttributesType
 end
 function GetQueueAttributesType(pd::LightXML.XMLElement)
     o = GetQueueAttributesType()
-    o.attributeNameSet = AWS.@parse_vector(String, LightXML.get_elements_by_tagname(pd, "AttributeName"))
+    o.attributeNameSet = AWS.@parse_vector(String, elements_by_tagname(pd, "AttributeName"))
     o.queueUrl = LightXML.content(LightXML.find_element(pd, "QueueUrl"))
     o
 end
@@ -243,7 +243,7 @@ type GetQueueAttributesResponseType
 end
 function GetQueueAttributesResponseType(pd::LightXML.XMLElement)
     o = GetQueueAttributesResponseType()
-    o.attributeSet = AWS.@parse_vector(AWS.SQS.AttributeType, LightXML.get_elements_by_tagname(LightXML.find_element(pd, "GetQueueAttributesResult"), "Attribute"))
+    o.attributeSet = AWS.@parse_vector(AWS.SQS.AttributeType, elements_by_tagname(LightXML.find_element(pd, "GetQueueAttributesResult"), "Attribute"))
     o.requestId = LightXML.content(LightXML.find_element(LightXML.find_element(pd, "ResponseMetadata"), "RequestId"))
     o
 end
@@ -267,8 +267,8 @@ function ReceiveMessageType(pd::LightXML.XMLElement)
     o.maxNumberOfMessages = AWS.safe_parseint(LightXML.content(LightXML.find_element(pd, "MaxNumberOfMessages")))
     o.visibilityTimeout = AWS.safe_parseint(LightXML.content(LightXML.find_element(pd, "VisibilityTimeout")))
     o.waitTimeSeconds = AWS.safe_parseint(LightXML.content(LightXML.find_element(pd, "WaitTimeSeconds")))
-    o.attributeNameSet = AWS.@parse_vector(String, LightXML.content(LightXML.get_elements_by_tagname(pd, "AttributeName")))
-    o.messageAttributeNameSet = AWS.@parse_vector(String, LightXML.content(LightXML.get_elements_by_tagname(pd, "MessageAttributeName")))
+    o.attributeNameSet = AWS.@parse_vector(String, LightXML.content(elements_by_tagname(pd, "AttributeName")))
+    o.messageAttributeNameSet = AWS.@parse_vector(String, LightXML.content(elements_by_tagname(pd, "MessageAttributeName")))
     o.queueUrl = LightXML.content(LightXML.find_element(pd, "QueueUrl"))
     o
 end
@@ -295,8 +295,8 @@ function MessageType(pd::LightXML.XMLElement)
     o.MD5OfBody = LightXML.content(LightXML.find_element(pd, "MD5OfBody"))
     ## MDP o.MD5OfMessageAttributes = LightXML.content(LightXML.find_element(pd, "MD5OfMessageAttributes"))
     o.body = LightXML.content(LightXML.find_element(pd, "Body"))
-    o.attributeSet = AWS.@parse_vector(AWS.SQS.AttributeType, LightXML.get_elements_by_tagname(pd, "Attribute"))
-    o.messageAttributeSet = AWS.@parse_vector(AWS.SQS.MessageAttributeType, LightXML.get_elements_by_tagname(pd, "MessageAttribute"))
+    o.attributeSet = AWS.@parse_vector(AWS.SQS.AttributeType, elements_by_tagname(pd, "Attribute"))
+    o.messageAttributeSet = AWS.@parse_vector(AWS.SQS.MessageAttributeType, elements_by_tagname(pd, "MessageAttribute"))
     o
 end
 
@@ -312,7 +312,7 @@ type ReceiveMessageResponseType
 end
 function ReceiveMessageResponseType(pd::LightXML.XMLElement)
     o = ReceiveMessageResponseType()
-    o.messageSet = AWS.@parse_vector(AWS.SQS.MessageType, LightXML.get_elements_by_tagname(LightXML.find_element(pd, "ReceiveMessageResult"), "Message"))
+    o.messageSet = AWS.@parse_vector(AWS.SQS.MessageType, elements_by_tagname(LightXML.find_element(pd, "ReceiveMessageResult"), "Message"))
     o.requestId = LightXML.content(LightXML.find_element(LightXML.find_element(pd, "ResponseMetadata"), "RequestId"))
     o
 end
@@ -332,7 +332,7 @@ end
 function SendMessageType(pd::LightXML.XMLElement)
     o = SendMessageType()
     o.delaySeconds = AWS.safe_parseint(LightXML.content(LightXML.find_element(pd, "DelaySeconds")))
-    o.messageAttributeSet = AWS.@parse_vector(AWS.SQS.MessageAttributeType, LightXML.get_elements_by_tagname(pd, "MessageAttribute"))
+    o.messageAttributeSet = AWS.@parse_vector(AWS.SQS.MessageAttributeType, elements_by_tagname(pd, "MessageAttribute"))
     o.messageBody = LightXML.content(LightXML.find_element(pd, "MessageBody"))
     o.queueUrl = LightXML.content(LightXML.find_element(pd, "QueueUrl"))
     o
@@ -371,7 +371,7 @@ type SetQueueAttributesType
 end
 function SetQueueAttributesType(pd::LightXML.XMLElement)
     o = SetQueueAttributesType()
-    o.attributeSet = AWS.@parse_vector(AWS.SQS.AttributeType, LightXML.get_elements_by_tagname(pd, "Attribute"))
+    o.attributeSet = AWS.@parse_vector(AWS.SQS.AttributeType, elements_by_tagname(pd, "Attribute"))
     o.queueUrl = LightXML.content(LightXML.find_element(pd, "QueueUrl"))
     o
 end
@@ -406,7 +406,7 @@ end
 function SendMessageBatchRequestEntryType(pd::LightXML.XMLElement)
 	o = SendMessageBatchRequestEntryType()
     o.delaySeconds = AWS.safe_parseint(LightXML.content(LightXML.find_element(pd, "DelaySeconds")))
-    o.messageAttributeSet = AWS.@parse_vector(AWS.SQS.MessageAttributeType, LightXML.get_elements_by_tagname(pd, "MessageAttribute"))
+    o.messageAttributeSet = AWS.@parse_vector(AWS.SQS.MessageAttributeType, elements_by_tagname(pd, "MessageAttribute"))
     o.messageBody = LightXML.content(LightXML.find_element(pd, "MessageBody"))
 end
 
@@ -422,7 +422,7 @@ end
 
 function SendMessageBatchType(pd::LightXML.XMLElement)
 	o = SendMessageBatchType()
-	o.sendMessageBatchRequestSet = AWS.@parse_vector(AWS.SQS.SendMessageBatchRequestEntryType, LightXML.get_elements_by_tagname(pd, "SendMessageBatchRequestEntry"))
+	o.sendMessageBatchRequestSet = AWS.@parse_vector(AWS.SQS.SendMessageBatchRequestEntryType, elements_by_tagname(pd, "SendMessageBatchRequestEntry"))
     o.queueUrl = LightXML.content(LightXML.find_element(pd, "QueueUrl"))
 end
 
@@ -478,8 +478,8 @@ end
 
 function SendMessageBatchResponseType(pd::LightXML.XMLElement)
 	o = SendMessageBatchResponseType()
-    o.sendMessageBatchResultSet = AWS.@parse_vector(AWS.SQS.SendMessageBatchResultEntryType, LightXML.get_elements_by_tagname(pd, "SendMessageBatchResultEntry"))
-    o.sendMessageBatchErrorSet = AWS.@parse_vector(AWS.SQS.SendMessageBatchResultErrorEntryType, LightXML.get_elements_by_tagname(pd, "SendMessageBatchResultErrorEntry"))
+    o.sendMessageBatchResultSet = AWS.@parse_vector(AWS.SQS.SendMessageBatchResultEntryType, elements_by_tagname(pd, "SendMessageBatchResultEntry"))
+    o.sendMessageBatchErrorSet = AWS.@parse_vector(AWS.SQS.SendMessageBatchResultErrorEntryType, elements_by_tagname(pd, "SendMessageBatchResultErrorEntry"))
 end
 
 export SendMessageBatchResponseType
@@ -510,7 +510,7 @@ end
 
 function DeleteMessageBatchType(pd::LightXML.XMLElement)
 	o = DeleteMessageBatchType()
-	o.deleteMessageBatchRequestSet = AWS.@parse_vector(AWS.SQS.DeleteMessageBatchRequestEntryType, LightXML.get_elements_by_tagname(pd, "DeleteMessageBatchRequestEntry"))
+	o.deleteMessageBatchRequestSet = AWS.@parse_vector(AWS.SQS.DeleteMessageBatchRequestEntryType, elements_by_tagname(pd, "DeleteMessageBatchRequestEntry"))
     o.queueUrl = LightXML.content(LightXML.find_element(pd, "QueueUrl"))
 end
 
@@ -546,7 +546,7 @@ end
 
 function DeleteMessageBatchResultEntryType(pd::LightXML.XMLElement)
 	o = DeleteMessageBatchResultEntryType()
-	o.deleteMessageBatchResultSet = AWS.@parse_vector(AWS.SQS.DeleteMessageBatchResultEntryType, LightXML.get_elements_by_tagname(pd, "DeleteMessageBatchResultEntry"))
+	o.deleteMessageBatchResultSet = AWS.@parse_vector(AWS.SQS.DeleteMessageBatchResultEntryType, elements_by_tagname(pd, "DeleteMessageBatchResultEntry"))
     o.queueUrl = LightXML.content(LightXML.find_element(pd, "QueueUrl"))
 end
 
@@ -562,8 +562,8 @@ end
 
 function DeleteMessageBatchResponseType(pd::LightXML.XMLElement)
 	o = DeleteMessageBatchResponseType()
-    o.deleteMessageBatchResultSet = AWS.@parse_vector(AWS.SQS.DeleteMessageBatchResultEntryType, LightXML.get_elements_by_tagname(pd, "DeleteMessageBatchResultEntry"))
-    o.deleteMessageBatchErrorSet = AWS.@parse_vector(AWS.SQS.DeleteMessageBatchResultErrorEntryType, LightXML.get_elements_by_tagname(pd, "DeleteMessageBatchResultErrorEntry"))
+    o.deleteMessageBatchResultSet = AWS.@parse_vector(AWS.SQS.DeleteMessageBatchResultEntryType, elements_by_tagname(pd, "DeleteMessageBatchResultEntry"))
+    o.deleteMessageBatchErrorSet = AWS.@parse_vector(AWS.SQS.DeleteMessageBatchResultErrorEntryType, elements_by_tagname(pd, "DeleteMessageBatchResultErrorEntry"))
 end
 
 export DeleteMessageBatchResponseType
@@ -661,8 +661,8 @@ end
 
 function ChangeMessageVisibilityResponseBatchType(pd::LightXML.XMLElement)
     o = ChangeMessageVisibilityResponseBatchType()
-    o.changeMessageVisibilityBatchResultEntrySet = AWS.@parse_vector(AWS.SQS.ChangeMessageVisibilityBatchResultEntryType, LightXML.get_elements_by_tagname(pd, "ChangeMessageVisibilityBatchResultEntry"))
-    o.changeMessageVisibilityBatchResultErrorEntrySet = AWS.@parse_vector(AWS.SQS.ChangeMessageVisibilityBatchResultErrorEntryType, LightXML.get_elements_by_tagname(pd, "ChangeMessageVisibilityBatchResultErrorEntry"))
+    o.changeMessageVisibilityBatchResultEntrySet = AWS.@parse_vector(AWS.SQS.ChangeMessageVisibilityBatchResultEntryType, elements_by_tagname(pd, "ChangeMessageVisibilityBatchResultEntry"))
+    o.changeMessageVisibilityBatchResultErrorEntrySet = AWS.@parse_vector(AWS.SQS.ChangeMessageVisibilityBatchResultErrorEntryType, elements_by_tagname(pd, "ChangeMessageVisibilityBatchResultErrorEntry"))
     o
 end
 
@@ -686,7 +686,7 @@ end
 
 function ListDeadLetterSourceQueuesResultType(pd::LightXML.XMLElement)
     o = ListDeadLetterSourceQueuesResultType()
-    o.queueUrlSet = String[LightXML.content(url) for url in LightXML.get_elements_by_tagname(LightXML.find_element(pd, "ListDeadLetterSourceQueuesResult"), "QueueUrl")]
+    o.queueUrlSet = String[LightXML.content(url) for url in elements_by_tagname(LightXML.find_element(pd, "ListDeadLetterSourceQueuesResult"), "QueueUrl")]
 end
 
 export ListDeadLetterSourceQueuesResultType