Convert utils/mk_client_whitelist.py and utils/dbconnect.py to py3.6 and move to utils/mk-client-whitelist/

Hainish · Hainish · commit 6c82452122a2 · 2018-02-23T09:44:24.000-08:00
diff --git a/utils/mk-client-whitelist/dbconnect.py b/utils/mk-client-whitelist/dbconnect.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3.6
 import MySQLdb
 
 try:    from db_private import DB_USER
@@ -7,7 +7,7 @@
 try:    from db_private import DB_PASS
 except: DB_PASS = "root"  # customise
 
-try:    from db_private import DB_NAME  
+try:    from db_private import DB_NAME
 except: DB_NAME = "observatory_api"
 
 TEST_DB_NAME = "tmp_TESTDB1"
@@ -21,4 +21,4 @@ def dbconnecttest():
   db = MySQLdb.connect(user=DB_USER, passwd=DB_PASS, db=TEST_DB_NAME)
   dbc = db.cursor()
   return db,dbc
-  
+
diff --git a/utils/mk-client-whitelist/run.py b/utils/mk-client-whitelist/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3.6
 
 # Make a list of the current top 1,000 certs to whitelist from the
 # Decentralized SSL Observatory's client submissions, to live in
@@ -17,15 +17,15 @@
 # run on the published datasets and read-only SQL servers too...
 
 q = """
-SELECT hex(reports.chain_fp), count, `Validity:Not After`, Subject 
-FROM reports JOIN chains       ON reports.chain_fp = chains.chain_fp 
+SELECT hex(reports.chain_fp), count, `Validity:Not After`, Subject
+FROM reports JOIN chains       ON reports.chain_fp = chains.chain_fp
              JOIN new_parsed_certs ON reports.cert_fp  = new_parsed_certs.cert_fp
-WHERE count > 1000 AND 
-      `Validity:Not After` > "%s" 
-GROUP BY reports.chain_fp 
-ORDER BY count DESC 
+WHERE count > 1000 AND
+      `Validity:Not After` > "{}"
+GROUP BY reports.chain_fp
+ORDER BY count DESC
 LIMIT 1000
-""" % (cutoff,)
+""".format(cutoff)
 
 dbc.execute(q)
 results = dbc.fetchmany(1000)
@@ -36,14 +36,14 @@
 
 header = """
 // These are SHA256 fingerprints for the most common chains observed by the
-// Decentralized SSL Observatory.  These should not be resubmitted.  
+// Decentralized SSL Observatory.  These should not be resubmitted.
 // This file is automatically generated by utils/mk_client_whitelist.py
 
 const X509ChainWhitelist = {"""
 
 print(header)
 for chain_fp in sorted([row[0] for row in results]):
-  print("  '%s' : true," % chain_fp)
+  print("  '{}' : true,".format(chain_fp))
 
 footer = "} ;"
 print(footer)
