Fix indentation for merge-rulesets.py

Hainish · Hainish · commit 742517ca930b · 2018-04-19T13:19:46.000-07:00
diff --git a/utils/merge-rulesets.py b/utils/merge-rulesets.py
@@ -15,12 +15,12 @@
 import xml.etree.ElementTree
 
 def normalize(f):
-	"""
-	OSX and Linux filesystems encode composite characters differently in
-	filenames. We should normalize to NFC: http://unicode.org/reports/tr15/
-	"""
-	f = unicodedata.normalize("NFC", f)
-	return f
+    """
+    OSX and Linux filesystems encode composite characters differently in
+    filenames. We should normalize to NFC: http://unicode.org/reports/tr15/
+    """
+    f = unicodedata.normalize("NFC", f)
+    return f
 
 # commandline arguments parsing (nobody use it, though)
 parser = argparse.ArgumentParser(description="Merge rulesets")
@@ -36,50 +36,50 @@ def normalize(f):
 
 # Under git bash, sed -i issues errors and sets the file "read-only".
 if os.path.isfile(ofn):
-	os.system("chmod u+w " + ofn)
+    os.system("chmod u+w " + ofn)
 
 # Library (JSON Object)
 library = []
 
 # Parse XML ruleset and construct JSON library
 print(" * Parsing XML ruleset and constructing JSON library...")
 for filename in sorted(files):
-	tree = xml.etree.ElementTree.parse(filename)
-	root = tree.getroot()
+    tree = xml.etree.ElementTree.parse(filename)
+    root = tree.getroot()
 
-	ruleset = {}
+    ruleset = {}
 
-	for attr in root.attrib:
-		ruleset[attr] = root.attrib[attr]
+    for attr in root.attrib:
+        ruleset[attr] = root.attrib[attr]
 
-	for child in root:
-		if child.tag in ["target", "rule", "securecookie", "exclusion"]:
-			if child.tag not in ruleset:
-				ruleset[child.tag] = []
-		else:
-			continue
+    for child in root:
+        if child.tag in ["target", "rule", "securecookie", "exclusion"]:
+            if child.tag not in ruleset:
+                ruleset[child.tag] = []
+        else:
+            continue
 
-		if child.tag == "target":
-			ruleset["target"].append(child.attrib["host"])
+        if child.tag == "target":
+            ruleset["target"].append(child.attrib["host"])
 
-		elif child.tag == "rule":
-			ru = {}
-			ru["from"] = child.attrib["from"]
-			ru["to"] = child.attrib["to"]
+        elif child.tag == "rule":
+            ru = {}
+            ru["from"] = child.attrib["from"]
+            ru["to"] = child.attrib["to"]
 
-			ruleset["rule"].append(ru)
+            ruleset["rule"].append(ru)
 
-		elif child.tag == "securecookie":
-			sc = {}
-			sc["host"] = child.attrib["host"]
-			sc["name"] = child.attrib["name"]
+        elif child.tag == "securecookie":
+            sc = {}
+            sc["host"] = child.attrib["host"]
+            sc["name"] = child.attrib["name"]
 
-			ruleset["securecookie"].append(sc)
+            ruleset["securecookie"].append(sc)
 
-		elif child.tag == "exclusion":
-			ruleset["exclusion"].append(child.attrib["pattern"])
+        elif child.tag == "exclusion":
+            ruleset["exclusion"].append(child.attrib["pattern"])
 
-	library.append(ruleset);
+    library.append(ruleset);
 
 # Write to default.rulesets
 print(" * Writing JSON library to %s" % ofn)
