Update makecrx.sh, utils/*.py for Python3 with 2to3

Hello71 · Seth Schoen · commit afb47e970c17 · 2013-05-02T14:55:53.000-07:00
diff --git a/makecrx.sh b/makecrx.sh
@@ -32,7 +32,7 @@ if [ -n "$1" ]; then
   fi
 fi
 
-VERSION=`python -c "import json ; print json.loads(open('chromium/manifest.json').read())['version']"`
+VERSION=`python -c "import json ; print(json.loads(open('chromium/manifest.json').read())['version'])"`
 
 echo "Building chrome version" $VERSION
 
diff --git a/utils/check_certs.py b/utils/check_certs.py
@@ -11,7 +11,7 @@
 for fname in sys.argv[1:]:
   hosts = host_targets.findall(open(fname).read())
   if not hosts:
-    print "Could not find <target hosts> in " + fname
+    print("Could not find <target hosts> in " + fname)
     continue
   successes = []
   failures = []
@@ -26,15 +26,15 @@
     else:
       successes.append(h)
   if successes and not failures:
-    print fname + " no cert warnings"
+    print(fname + " no cert warnings")
   elif failures and not successes:
-    print fname + " categorical failure:"
+    print(fname + " categorical failure:")
     for f in failures:
-      print "    " + f
+      print("    " + f)
   else:
-    print fname + " mixed results:"
+    print(fname + " mixed results:")
     for s in successes:
-      print "    " + s + " is OK"
+      print("    " + s + " is OK")
     for f in failures:
-      print "    " + f
+      print("    " + f)
 
diff --git a/utils/chromium-preloads.py b/utils/chromium-preloads.py
@@ -3,8 +3,8 @@
 # autogenerate sample versions of rules from Chromium browser's HSTS
 # preload list (in the from-preloads/ directory)
 
-import urllib2, re, glob, os
-preloads = urllib2.urlopen("https://src.chromium.org/viewvc/chrome/trunk/src/net/http/transport_security_state_static.h?content-type=text%2Fplain").read()
+import urllib.request, urllib.error, urllib.parse, re, glob, os
+preloads = urllib.request.urlopen("https://src.chromium.org/viewvc/chrome/trunk/src/net/http/transport_security_state_static.h?content-type=text%2Fplain").read()
 
 def escape(s):
     return re.sub("\.", "\\.", s)
@@ -37,7 +37,7 @@ def make_rule(name, hosts):
     open("from-preloads/%s.xml" % name.capitalize(), "w").write(output)
 
 t = re.compile('", true')
-preloads = filter(t.search,preloads.split("\n"))
+preloads = list(filter(t.search,preloads.split("\n")))
 
 preloads = [x.split('"')[1] for x in preloads]
 preloads = [re.sub('\\\\[0-9]*', '.', x) for x in preloads]
@@ -48,7 +48,7 @@ def make_rule(name, hosts):
 d = {}
 for x in preloads:
     if any(map(re.compile(x).search, rules)):
-        print "Ignored existing domain", x
+        print("Ignored existing domain", x)
         continue
     domain = ".".join(x.split(".")[-2:])
     d.setdefault(domain, []).append(x)
@@ -59,4 +59,4 @@ def make_rule(name, hosts):
 for k in d:
     make_rule(k, d[k])
 
-print "Please examine %d new rules in from-preloads/ directory." % len(d)
+print("Please examine %d new rules in from-preloads/ directory." % len(d))
diff --git a/utils/merge-rulesets.py b/utils/merge-rulesets.py
@@ -20,10 +20,10 @@
 # cleanup after bugs :/
 misfile = rulesets_fn + "r"
 if os.path.exists(misfile):
-  print "Cleaning up malformed rulesets file..."
+  print("Cleaning up malformed rulesets file...")
   os.unlink(misfile)
 
-print "Creating ruleset library..."
+print("Creating ruleset library...")
 
 # Under git bash, sed -i issues errors and sets the file "read only".  Thanks.
 if os.path.isfile(rulesets_fn):
@@ -50,7 +50,7 @@
 library.write("</rulesetlibrary>\n")
 library.close()
 
-print "Removing whitespaces and comments..."
+print("Removing whitespaces and comments...")
 
 def rulesize():
   return len(open(rulesets_fn).read())
@@ -60,18 +60,18 @@ def rulesize():
 call(sedcmd + [r"s/<!--.*?-->//g;/<!--/N;//ba", rulesets_fn])
 call(["sed", "-i", r":a;N;$!ba;s/\n//g;s/>[ 	]*</></g;s/[ 	]*to=/ to=/g;s/[ 	]*from=/ from=/g;s/ \/>/\/>/g", rulesets_fn])
 call(["sed", "-i", r"s/<\/ruleset>/<\/ruleset>\n/g", rulesets_fn])
-print "Crushed", crush, "bytes of rulesets into", rulesize()
+print(("Crushed", crush, "bytes of rulesets into", rulesize()))
 
 try:
   if 0 == call(["xmllint", "--noout", rulesets_fn]):
-    print rulesets_fn, "passed XML validity test."
+    print((rulesets_fn, "passed XML validity test."))
   else:
-    print "ERROR:", rulesets_fn, "failed XML validity test!"
+    print(("ERROR:", rulesets_fn, "failed XML validity test!"))
     sys.exit(1)
-except OSError, e:
+except OSError as e:
   if "No such file or directory" not in traceback.format_exc():
     raise
-  print "WARNING: xmllint not present; validation of", rulesets_fn, " skipped."
+  print(("WARNING: xmllint not present; validation of", rulesets_fn, " skipped."))
 
 # We make default.rulesets at build time, but it shouldn't have a variable
 # timestamp
diff --git a/utils/mk_client_whitelist.py b/utils/mk_client_whitelist.py
@@ -32,7 +32,7 @@
 
 sys.stderr.write("TOP 100:\n")
 for n in range(100):
-  sys.stderr.write(`results[n][1:4]` + '\n')
+  sys.stderr.write(repr(results[n][1:4]) + '\n')
 
 header = """
 // These are SHA256 fingerprints for the most common chains observed by the
@@ -41,11 +41,11 @@
 
 const X509ChainWhitelist = {"""
 
-print header
+print(header)
 for chain_fp in sorted([row[0] for row in results]):
-  print "  '%s' : true," % chain_fp
+  print("  '%s' : true," % chain_fp)
 
 footer = "} ;"
-print footer
+print(footer)
 
 
diff --git a/utils/trivial-response.py b/utils/trivial-response.py
@@ -39,7 +39,7 @@
             if tree.xpath('/ruleset/@default_off'):
                 default_off += 1
                 continue
-        except Exception, e:
+        except Exception as e:
             continue
 
         proc = subprocess.Popen([rule_script, fil, rule_file %
@@ -48,12 +48,12 @@
 
     for (proc, f) in procs:
         proc.poll()
-        print "POLL'D"
+        print("POLL'D")
         if proc.returncode != None:
-            print "FUCKED"
+            print("FUCKED")
             with open(rule_file % f, 'r') as rule_fd:
                 with open(report_file, 'a') as report_fd:
-                    print "CONTEXT"
+                    print("CONTEXT")
                     report_fd.writelines(rule_fd)
             os.unlink(rule_file % f)
             procs.remove((proc, f))
diff --git a/utils/trivial-validate.py b/utils/trivial-validate.py
@@ -105,11 +105,11 @@ def test_unencrypted_to(tree):
         if to[:6] != "https:" and to[:5] != "http:":
             return False
         elif to[:5] == "http:" and downgrade:
-	    sys.stdout.write("warning: downgrade rule in %s redirects " % fi)
-	    sys.stdout.write("to http.\n")
+            sys.stdout.write("warning: downgrade rule in %s redirects " % fi)
+            sys.stdout.write("to http.\n")
         elif to[:5] == "http:":
-	    sys.stdout.write("error: rule in %s redirects to http and " % fi)
-	    sys.stdout.write("downgrade attribute not specified.\n")
+            sys.stdout.write("error: rule in %s redirects to http and " % fi)
+            sys.stdout.write("downgrade attribute not specified.\n")
             return False
     return True
 
@@ -153,7 +153,7 @@ def test_duplicated_target_host(tree):
     targets = tree.xpath("/ruleset/target/@host")
     return len(set(targets)) == len(targets)
 
-printable_characters = set(map(chr, xrange(32, 127)))
+printable_characters = set(map(chr, list(range(32, 127))))
 
 def test_non_ascii(tree):
     # Rules containing non-printable characters.
@@ -199,7 +199,7 @@ def get_all_names_and_targets(d):
                 else:
                     continue
             seen_file = True
-        except Exception, oops:
+        except Exception as oops:
             if fi[-4:] != ".xml":
                 continue
             failure = 1
@@ -231,7 +231,7 @@ def get_all_names_and_targets(d):
             if tree.xpath("/ruleset"):
                 sys.stdout.write("warning: ruleset in file without .xml extension: %s\n" % fi)
         seen_file = True
-    except Exception, oops:
+    except Exception as oops:
         failure = 1
         sys.stdout.write("%s failed XML validity: %s\n" % (fi, oops))
     ruleset_name = tree.xpath("/ruleset/@name")[0]
