* S3/Utils.py: getDictFromTree() now recurses into sub-trees.

git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@472 830e0280-6d2a-0410-9c65-932aecc39d9d
firstclown · Apr 8, 2011 · 323a4ca · 323a4ca
1 parent 2a0d89d
commit 323a4ca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-10  Michal Ludvig  <mludvig@logix.net.nz>
+
+	* S3/Utils.py: getDictFromTree() now recurses into
+	  sub-trees.
+
 2011-03-30  Michal Ludvig  <mludvig@logix.net.nz>
 
 	* S3/CloudFront.py: Fix warning with Python 2.7

diff --git a/S3/Utils.py b/S3/Utils.py
@@ -82,14 +82,16 @@ def getDictFromTree(tree):
 	ret_dict = {}
 	for child in tree.getchildren():
 		if child.getchildren():
-			## Complex-type child. We're not interested
-			continue
+			## Complex-type child. Recurse
+			content = getDictFromTree(child)
+		else:
+			content = child.text
 		if ret_dict.has_key(child.tag):
 			if not type(ret_dict[child.tag]) == list:
 				ret_dict[child.tag] = [ret_dict[child.tag]]
-			ret_dict[child.tag].append(child.text or "")
+			ret_dict[child.tag].append(content or "")
 		else:
-			ret_dict[child.tag] = child.text or ""
+			ret_dict[child.tag] = content or ""
 	return ret_dict
 __all__.append("getDictFromTree")