Update cron scripts to use python3

OpenBMP · Mar 30, 2021 · 121f237 · 121f237
1 parent 4dded7f
commit 121f237
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 78 deletions.
diff --git a/cron_scripts/gen-whois/dbHandler.py b/cron_scripts/gen-whois/dbHandler.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
-    Copyright (c) 2018 Cisco Systems, Inc. and others.  All rights reserved.
-    Copyright (c) 2018 Tim Evens (tim@evensweb.com).  All rights reserved.
+  Copyright (c) 2021 Cisco Systems, Inc. and Tim Evens.  All rights reserved.
 
   This program and the accompanying materials are made available under the
   terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -41,7 +40,7 @@ def connectDb(self, user, pw, host, database):
 
             self.cursor = self.conn.cursor()
 
-        except (py.ProgrammingError), err:
+        except (py.ProgrammingError) as err:
             print("ERROR: Connect failed: " + str(err))
             raise err
 
@@ -65,7 +64,7 @@ def createTable(self, tableName, tableSchema, dropIfExists = True):
             :return: True if the table successfully was created, false otherwise
         """
         if (not self.cursor):
-            print "ERROR: Looks like psql is not connected, try to reconnect."
+            print("ERROR: Looks like psql is not connected, try to reconnect.")_
             return False
 
         try:
@@ -91,7 +90,7 @@ def createTable(self, tableName, tableSchema, dropIfExists = True):
             :return: True if the table successfully was created, false otherwise
         """
         if (not self.cursor):
-            print "ERROR: Looks like psql is not connected, try to reconnect."
+            print("ERROR: Looks like psql is not connected, try to reconnect.")
             return False
 
         try:
@@ -117,7 +116,7 @@ def query(self, query, queryParams=None):
             :return: Returns "None" if error, otherwise array list of rows
         """
         if (not self.cursor):
-            print "ERROR: Looks like psql is not connected, try to reconnect"
+            print("ERROR: Looks like psql is not connected, try to reconnect")
             return None
 
         try:
@@ -155,7 +154,7 @@ def queryNoResults(self, query, queryParams=None):
             :return: Returns True if successful, false if not.
         """
         if (not self.cursor):
-            print "ERROR: Looks like psql is not connected, try to reconnect"
+            print("ERROR: Looks like psql is not connected, try to reconnect")
             return None
 
         try:

diff --git a/cron_scripts/gen-whois/gen_whois_asn.py b/cron_scripts/gen-whois/gen_whois_asn.py
@@ -1,11 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
-  Copyright (c) 2018 Cisco Systems, Inc. and others.  All rights reserved.
-  Copyright (c) 2018 Tim Evens (tim@evensweb.com).  All rights reserved.
-
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  and is available at http://www.eclipse.org/legal/epl-v10.html
+  Copyright (c) 2021 Cisco Systems, Inc. and Tim Evens.  All rights reserved.
 
   .. moduleauthor:: Tim Evens <tim@evensweb.com>
 """
@@ -16,7 +11,6 @@
 from collections import OrderedDict
 from time import sleep
 import subprocess
-import traceback
 import dns.resolver
 
 TBL_GEN_WHOIS_ASN_NAME = "info_asn"
@@ -94,9 +88,9 @@ def getASNList(db):
     """
     # Run query and store data
     rows = db.query(QUERY_AS_LIST)
-    print "Query for ASN List took %r seconds" % (db.last_query_time)
+    print("Query for ASN List took %r seconds" % (db.last_query_time))
 
-    print "total rows = %d" % len(rows)
+    print("total rows = %d" % len(rows))
 
     asnList = []
 
@@ -389,7 +383,7 @@ def parseCmdArgs(argv):
 
         # The last arg should be the command
         if (len(args) <= 0):
-            print "ERROR: Missing the database host/IP"
+            print("ERROR: Missing the database host/IP")
             usage(argv[0])
             sys.exit(1)
 
@@ -400,13 +394,13 @@ def parseCmdArgs(argv):
 
         # The last arg should be the command
         if (found_req_args < REQUIRED_ARGS):
-            print "ERROR: Missing required args, found %d required %d" % (found_req_args, REQUIRED_ARGS)
+            print("ERROR: Missing required args, found %d required %d" % (found_req_args, REQUIRED_ARGS))
             usage(argv[0])
             sys.exit(1)
 
         return cmd_args
 
-    except (getopt.GetoptError, TypeError), err:
+    except (getopt.GetoptError, TypeError) as err:
         print str(err)  # will print something like "option -a not recognized"
         usage(argv[0])
         sys.exit(2)
@@ -417,15 +411,15 @@ def usage(prog):
 
         :param prog:  Program name
     """
-    print ""
-    print "Usage: %s [OPTIONS] <database host/ip address>" % prog
-    print ""
-    print "  -u, --user".ljust(30) + "Database username"
-    print "  -p, --password".ljust(30) + "Database password"
-    print ""
-
-    print "OPTIONAL OPTIONS:"
-    print "  -h, --help".ljust(30) + "Print this help menu"
+    print ("")
+    print ("Usage: %s [OPTIONS] <database host/ip address>" % prog)
+    print ("")
+    print ("  -u, --user".ljust(30) + "Database username")
+    print ("  -p, --password".ljust(30) + "Database password")
+    print ("")
+
+    print ("OPTIONAL OPTIONS:")
+    print ("  -h, --help".ljust(30) + "Print this help menu")
 
 
 

diff --git a/cron_scripts/gen-whois/gen_whois_route.py b/cron_scripts/gen-whois/gen_whois_route.py
@@ -1,11 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
-  Copyright (c) 2018 Cisco Systems, Inc. and others.  All rights reserved.
-  Copyright (c) 2018 Tim Evens (tim@evensweb.com).  All rights reserved.
-
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  and is available at http://www.eclipse.org/legal/epl-v10.html
+  Copyright (c) 2021 Cisco Systems, Inc. and Tim Evens.  All rights reserved.
 
   .. moduleauthor:: Tim Evens <tim@evensweb.com>
 """
@@ -82,7 +77,7 @@ def import_rr_db_file(db, source, db_filename):
     record = {'source': source}
     inf = None
 
-    print "Parsing %s" % db_filename
+    print("Parsing %s" % db_filename)
     if (db_filename.endswith(".gz")):
         inf = gzip.open(db_filename, 'rb')
     else:
@@ -116,7 +111,7 @@ def import_rr_db_file(db, source, db_filename):
                         record[WHOIS_ATTR_MAP[prev_attr]] += "\n" + value
 
                     except:
-                        print "problem with continuation: (%s) '%s'\n\t\t%r" % (prev_attr, line, record)
+                        print("problem with continuation: (%s) '%s'\n\t\t%r" % (prev_attr, line, record))
                         pass
 
             elif ': ' in line:
@@ -226,16 +221,16 @@ def download_data_file():
 
     for source in RR_DB_FTP:
         try:
-            print "Downloading %s..." % source
+            print ("Downloading %s..." % source)
             ftp = FTP(RR_DB_FTP[source]['site'])
             ftp.login()
             ftp.cwd(RR_DB_FTP[source]['path'])
             ftp.retrbinary("RETR %s" % RR_DB_FTP[source]['filename'],
                            open("%s/%s" % (TMP_DIR, RR_DB_FTP[source]['filename']), 'wb').write)
             ftp.quit()
-            print "      Done downloading %s" % source
+            print ("      Done downloading %s" % source)
         except:
-            print "Error processing %s, skipping" % source
+            print ("Error processing %s, skipping" % source)
             traceback.print_exc()
 
 
@@ -296,7 +291,7 @@ def parseCmdArgs(argv):
 
         # The last arg should be the command
         if (len(args) <= 0):
-            print "ERROR: Missing the database host/IP"
+            print ("ERROR: Missing the database host/IP")
             usage(argv[0])
             sys.exit(1)
 
@@ -306,14 +301,14 @@ def parseCmdArgs(argv):
 
         # The last arg should be the command
         if (found_req_args < REQUIRED_ARGS):
-            print "ERROR: Missing required args, found %d required %d" % (found_req_args, REQUIRED_ARGS)
+            print ("ERROR: Missing required args, found %d required %d" % (found_req_args, REQUIRED_ARGS))
             usage(argv[0])
             sys.exit(1)
 
         return cmd_args
 
-    except (getopt.GetoptError, TypeError), err:
-        print str(err)  # will print something like "option -a not recognized"
+    except (getopt.GetoptError, TypeError) as err:
+        print (str(err))  # will print something like "option -a not recognized"
         usage(argv[0])
         sys.exit(2)
 
@@ -323,16 +318,16 @@ def usage(prog):
 
         :param prog:  Program name
     """
-    print ""
-    print "Usage: %s [OPTIONS] <database host/ip address>" % prog
-    print ""
-    print "  -u, --user".ljust(30) + "Database username"
-    print "  -p, --password".ljust(30) + "Database password"
-    print ""
-
-    print "OPTIONAL OPTIONS:"
-    print "  -h, --help".ljust(30) + "Print this help menu"
-    print "  -d, --dbName".ljust(30) + "Database name, default is 'openbmp'"
+    print ("")
+    print ("Usage: %s [OPTIONS] <database host/ip address>" % prog)
+    print ("")
+    print ("  -u, --user".ljust(30) + "Database username")
+    print ("  -p, --password".ljust(30) + "Database password")
+    print ("")
+
+    print ("OPTIONAL OPTIONS:")
+    print ("  -h, --help".ljust(30) + "Print this help menu")
+    print ("  -d, --dbName".ljust(30) + "Database name, default is 'openbmp'")
 
 
 def main():

diff --git a/cron_scripts/rpki/rpki_validator.py b/cron_scripts/rpki/rpki_validator.py
@@ -1,10 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
-  Copyright (c) 2018 Tim Evens.  All rights reserved.
-
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  and is available at http://www.eclipse.org/legal/epl-v10.html
+  Copyright (c) 2021 Cisco Systems, Inc. and Tim Evens.  All rights reserved.
 
   .. moduleauthor:: Tim Evens <tim@evensweb.com>
 """
@@ -123,7 +119,7 @@ def parseCmdArgs(argv):
 
         # The last arg should be the command
         if (len(args) <= 0):
-            print "ERROR: Missing the database host/IP"
+            print ("ERROR: Missing the database host/IP")
             usage(argv[0])
             sys.exit(1)
 
@@ -134,14 +130,14 @@ def parseCmdArgs(argv):
 
         # The last arg should be the command
         if (found_req_args < REQUIRED_ARGS):
-            print "ERROR: Missing required args, found %d required %d" % (found_req_args, REQUIRED_ARGS)
+            print ("ERROR: Missing required args, found %d required %d" % (found_req_args, REQUIRED_ARGS))
             usage(argv[0])
             sys.exit(1)
 
         return cmd_args
 
     except (getopt.GetoptError, TypeError) as err:
-        print str(err)  # will print something like "option -a not recognized"
+        print (str(err))  # will print something like "option -a not recognized"
         usage(argv[0])
         sys.exit(2)
 
@@ -151,20 +147,20 @@ def usage(prog):
 
         :param prog:  Program name
     """
-    print ""
-    print "Usage: %s [OPTIONS] <database host/ip address>" % prog
-    print ""
-    print "  -u, --user".ljust(30) + "Database username"
-    print "  -p, --password".ljust(30) + "Database password"
-    print "  -s, --server".ljust(30) + "RPKI Validator server address"
-    print ""
+    print ("")
+    print ("Usage: %s [OPTIONS] <database host/ip address>" % prog)
+    print ("")
+    print ("  -u, --user".ljust(30) + "Database username")
+    print ("  -p, --password".ljust(30) + "Database password")
+    print ("  -s, --server".ljust(30) + "RPKI Validator server address")
+    print ("")
 
-    print "OPTIONAL OPTIONS:"
-    print "  -h, --help".ljust(30) + "Print this help menu"
-    print "  -d, --dbName".ljust(30) + "Database name, default is 'openbmp'"
+    print ("OPTIONAL OPTIONS:")
+    print ("  -h, --help".ljust(30) + "Print this help menu")
+    print ("  -d, --dbName".ljust(30) + "Database name, default is 'openbmp'")
 
-    print "NOTES:"
-    print "   RPKI validator http://server/export.json is used to populate the DB"
+    print ("NOTES:")
+    print ("   RPKI validator http://server/export.json is used to populate the DB")
 
 
 def main():
@@ -176,7 +172,7 @@ def main():
 
     server = cfg['server']
     load_export(db, server);
-    print "Loaded rpki roas"
+    print ("Loaded rpki roas")
 
     # Purge old entries that didn't get updated
     db.queryNoResults("DELETE FROM rpki_validator WHERE timestamp < now() - interval '1 hour'")