From 1d77d4dd873ab1c316e32529ce1c8ee71ea5444f Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 8 Mar 2010 17:11:30 +0000 Subject: Switch config parser to rpki.config. svn path=/myrpki.rototill/myrpki.py; revision=3043 --- myrpki.rototill/myrpki.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/myrpki.rototill/myrpki.py b/myrpki.rototill/myrpki.py index 74f9304a..c719014f 100644 --- a/myrpki.rototill/myrpki.py +++ b/myrpki.rototill/myrpki.py @@ -49,7 +49,8 @@ PERFORMANCE OF THIS SOFTWARE. # Only standard Python libraries for this program, please. -import subprocess, csv, re, os, getopt, sys, ConfigParser, base64, glob +import subprocess, csv, re, os, getopt, sys, base64, glob +import rpki.config from xml.etree.ElementTree import Element, SubElement, ElementTree @@ -630,7 +631,6 @@ def main(argv = ()): """ cfg_file = "myrpki.conf" - section = "myrpki" opts, argv = getopt.getopt(argv, "c:h:?", ["config=", "help"]) for o, a in opts: @@ -642,22 +642,21 @@ def main(argv = ()): if argv: raise RuntimeError, "Unexpected arguments %r" % (argv,) - cfg = ConfigParser.RawConfigParser() - cfg.readfp(open(cfg_file, "r"), cfg_file) + cfg = rpki.config.parser(cfg_file, "myrpki") - my_handle = cfg.get(section, "handle") - roa_csv_file = cfg.get(section, "roa_csv") - children_csv_file = cfg.get(section, "children_csv") - parents_csv_file = cfg.get(section, "parents_csv") - prefix_csv_file = cfg.get(section, "prefix_csv") - asn_csv_file = cfg.get(section, "asn_csv") - bpki_dir = cfg.get(section, "bpki_resources_directory") - xml_filename = cfg.get(section, "xml_filename") - repository_bpki_certificate = cfg.get(section, "repository_bpki_certificate") - repository_handle = cfg.get(section, "repository_handle") + my_handle = cfg.get("handle") + roa_csv_file = cfg.get("roa_csv") + children_csv_file = cfg.get("children_csv") + parents_csv_file = cfg.get("parents_csv") + prefix_csv_file = cfg.get("prefix_csv") + asn_csv_file = cfg.get("asn_csv") + bpki_dir = cfg.get("bpki_resources_directory") + xml_filename = cfg.get("xml_filename") + repository_bpki_certificate = cfg.get("repository_bpki_certificate") + repository_handle = cfg.get("repository_handle") global openssl - openssl = cfg.get(section, "openssl") if cfg.has_option(section, "openssl") else "openssl" + openssl = cfg.get("openssl", "openssl") bpki = CA(cfg_file, bpki_dir) -- cgit v1.2.3