From 5ceb1bca5e90bc64120464b4ba8fad4dcbc94b94 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Tue, 16 Jun 2009 03:30:14 +0000 Subject: Checkpoint svn path=/myrpki/myrpki.py; revision=2524 --- myrpki/myrpki.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'myrpki/myrpki.py') diff --git a/myrpki/myrpki.py b/myrpki/myrpki.py index d499a5c0..b16f88ea 100644 --- a/myrpki/myrpki.py +++ b/myrpki/myrpki.py @@ -95,7 +95,8 @@ def csv_open(filename, delimiter = "\t", dialect = None): return csv.reader(open(filename, "rb"), dialect = dialect, delimiter = delimiter) def PEMElement(e, tag, filename): - SubElement(e, tag).text = "".join(open(filename).readlines()[1:-1]) + SubElement(e, tag).text = "".join(p.strip() + for p in open(filename).readlines()[1:-1]) def bpki_ca(e): @@ -169,7 +170,7 @@ for handle, pn in csv_open(prefixes_csv_file): for handle, asn in csv_open(asns_csv_file): kids.add(handle = handle, asn = asn) -e = Element("myrpki", handle = my_handle) +e = Element("myrpki", version = "1", handle = my_handle) roas.xml(e) kids.xml(e) bpki_ca(e) -- cgit v1.2.3