Clean up CSV code per suggestions from Warren

svn path=/myrpki.rototill/apnic-to-csv.py; revision=3147

1 files changed, 3 insertions, 7 deletions

diff --git a/myrpki.rototill/arin-to-csv.py b/myrpki.rototill/arin-to-csv.py
index 5b4caae1..55e5762a 100644
--- a/myrpki.rototill/arin-to-csv.py
+++ b/myrpki.rototill/arin-to-csv.py
@@ -94,15 +94,11 @@ class main(object):
     assert sep, "Couldn't find separator in %r" % line
     return tag.strip(), val.strip()
 
-  @staticmethod
-  def csvout(fn):
-    return csv.writer(open(fn, "w"), dialect = myrpki.csv_dialect)
-
   def __init__(self):
-    self.asns = self.csvout("asns.csv")
-    self.prefixes = self.csvout("prefixes.csv")
+    self.asns = myrpki.csv_writer("asns.csv")
+    self.prefixes = myrpki.csv_writer("prefixes.csv")
     try:
-      self.translations = dict((src, dst) for src, dst in myrpki.csv_open("translations.csv"))
+      self.translations = dict((src, dst) for src, dst in myrpki.csv_reader("translations.csv", columns = 2))
     except IOError:
       pass
     f = gzip.open("arin_db.txt.gz")