nits

diff --git a/get_asnmap.sh b/get_asnmap.sh
index 1623bb701abb11411d87ee57b9ea4f58d5aa079d..a7ede4b5d4f392e88396a73d7a3efa39a1bbe835 100644 (file)
--- a/get_asnmap.sh
+++ b/get_asnmap.sh
@@ -12,7 +12,7 @@
 # - "hk"
 # - "guam"
 #
-vp="london"
+vp="current"
 
 tstamp=$(date +%Y%m%d);
 

diff --git a/makedb.py b/makedb.py
index ba0367eaa8cd58f2631c69e428307d175f12cf04..7259cfc92f41f600c658f7b1c44d4719e272757d 100644 (file)
--- a/makedb.py
+++ b/makedb.py
@@ -13,7 +13,7 @@ dirname = os.path.dirname(sys.argv[0])
 ip4net2asn = []
 
 # e.g., http://thyme.apnic.net/us/data-raw-table
-f = file(os.path.join(dirname, "ip4net2asn.txt"), "r")
+f = open(os.path.join(dirname, "ip4net2asn.txt"), "r")
 
 for line in f:
        [ip4net, asn] = line.split("\t")
@@ -26,7 +26,7 @@ f.close()
 asn2name = []
 
 # e.g., http://thyme.apnic.net/hk/data-used-autnums
-f = file(os.path.join(dirname, "asn2name.txt"), "r")
+f = open(os.path.join(dirname, "asn2name.txt"), "r")
 
 for line in f:
        asn = line[0:6].strip(" ")