1. s3cmd
  2. Commit dd1f7fb8d1747c06399236db48b8b50c7275a8f8
Browse code

Fix indentation causing failures

Commit 41787acd9 accidentally over-indented its change. This was
leading to test suite failures, valid failures. Specifically, the
test suite would fail when removing buckets that have objects in them
(the first test of the suite).

Reading that patch, it's obvious that the "if error_node is not None"
test got indented one level too deep from where it was supposed to
be. Fixing that resolves the test suite failure again.

Matt Domsch authored on 2015/02/04 23:02:50
Showing 1 changed files
S3/Exceptions.py
History View file @ dd1f7fb
... ... 
@@ -101,13 +101,13 @@ class S3Error (S3Exception):
101 101 
         error_node = tree
102 102 
         if not error_node.tag == "Error":
103 103 
             error_node = tree.find(".//Error")
104 
-            if error_node is not None:
105 
-                for child in error_node.getchildren():
106 
-                    if child.text != "":
107 
-                        debug("ErrorXML: " + child.tag + ": " + repr(child.text))
108 
-                        info[child.tag] = child.text
109 
-            else:
110 
-                raise S3ResponseError("Malformed error XML returned from remote server.")
104 
+        if error_node is not None:
105 
+            for child in error_node.getchildren():
106 
+                if child.text != "":
107 
+                    debug("ErrorXML: " + child.tag + ": " + repr(child.text))
108 
+                    info[child.tag] = child.text
109 
+        else:
110 
+            raise S3ResponseError("Malformed error XML returned from remote server.")
111 111 
         return info
112 112
113 113