@@ -11,8 +11,15 @@ import ExitCodes

 try:

     import xml.etree.ElementTree as ET

 except ImportError:

+    # xml.etree.ElementTree was only added in python 2.5

     import elementtree.ElementTree as ET

+try:

+    from xml.etree.ElementTree import ParseError as XmlParseError

+except ImportError:

+    # ParseError was only added in python2.7, before ET was raising ExpatError

+    from xml.parsers.expat import ExpatError as XmlParseError

+

 class S3Exception(Exception):

     def __init__(self, message = ""):

         self.message = unicodise(message)

@@ -49,7 +56,7 @@ class S3Error (S3Exception):

         if response.has_key("data") and response["data"]:

             try:

                 tree = getTreeFromXml(response["data"])

-            except ET.ParseError:

+            except XmlParseError:

                 debug("Not an XML response")

             else:

                 self.info.update(self.parse_error_xml(tree))

@@ -47,8 +47,8 @@ else:

 try:

     import xml.etree.ElementTree as ET

 except ImportError:

+    # xml.etree.ElementTree was only added in python 2.5

     import elementtree.ElementTree as ET

-from xml.parsers.expat import ExpatError

 __all__ = []

 def parseNodes(nodes):

@@ -88,11 +88,8 @@ def getTreeFromXml(xml):

         if xmlns:

             tree.attrib['xmlns'] = xmlns

         return tree

-    except ExpatError, e:

-        error(e)

-        raise Exceptions.ParameterError("Bucket contains invalid filenames. Please run: s3cmd fixbucket s3://your-bucket/")

     except Exception, e:

-        error(e)

+        error("Error parsing xml: %s", e)

         error(xml)

         raise