@@ -1,3 +1,8 @@

+2008-11-24  Michal Ludvig  <michal@logix.cz>

+

+	* S3/Utils.py: Common XML parser.

+	* s3cmd, S3/Exeptions.py: Print info message on Error.

+

 2008-11-21  Michal Ludvig  <michal@logix.cz>

 	* s3cmd: Support for 'cp' command.

@@ -3,6 +3,7 @@

 ##         http://www.logix.cz/michal

 ## License: GPL Version 2

+from Utils import getRootTagName

 from logging import debug, info, warning, error

 try:

@@ -27,7 +28,7 @@ class S3Error (S3Exception):

 		if response.has_key("headers"):

 			for header in response["headers"]:

 				debug("HttpHeader: %s: %s" % (header, response["headers"][header]))

-		if response.has_key("data"):

+		if response.has_key("data") and getRootTagName(response["data"]) == "Error":

 			tree = ET.fromstring(response["data"])

 			for child in tree.getchildren():

 				if child.text != "":

@@ -57,19 +57,26 @@ def getNameSpace(element):

 		return ""

 	return re.compile("^(\{[^}]+\})").match(element.tag).groups()[0]

-def getListFromXml(xml, node):

+def getTreeFromXml(xml):

 	tree = ET.fromstring(xml)

-	xmlns = getNameSpace(tree)

-	nodes = tree.findall('.//%s%s' % (xmlns, node))

-	return parseNodes(nodes, xmlns)

+	tree.xmlns = getNameSpace(tree)

+	return tree

+	

+def getListFromXml(xml, node):

+	tree = getTreeFromXml(xml)

+	nodes = tree.findall('.//%s%s' % (tree.xmlns, node))

+	return parseNodes(nodes, tree.xmlns)

 def getTextFromXml(xml, xpath):

-	tree = ET.fromstring(xml)

-	xmlns = getNameSpace(tree)

+	tree = getTreeFromXml(xml)

 	if tree.tag.endswith(xpath):

 		return tree.text

 	else:

-		return tree.findtext(fixupXPath(xmlns, xpath))

+		return tree.findtext(fixupXPath(tree.xmlns, xpath))

+

+def getRootTagName(xml):

+	tree = getTreeFromXml(xml)

+	return stripTagXmlns(tree.xmlns, tree.tag)

 def dateS3toPython(date):

 	date = re.compile("\.\d\d\dZ").sub(".000Z", date)

@@ -1108,6 +1108,8 @@ def main():

 		cmd_func(args)

 	except S3Error, e:

 		error("S3 error: %s" % e)

+		if e.info.has_key("Message"):

+			error(e.info['Message'])

 		sys.exit(1)

 	except ParameterError, e:

 		error("Parameter problem: %s" % e)