"Any programmer who fails to comply with the standard naming, formatting,

or commenting conventions should be shot.  If it so happens that it is
inconvenient to shoot him, then he is to be politely requested to recode
his program in adherence to the above standard."
		-- Michael Spier, Digital Equipment Corporation

svn path=/branches/tk705/; revision=6152

1 files changed, 230 insertions, 225 deletions

diff --git a/ca/rpki-confgen b/ca/rpki-confgen
index 07c87f0f..beb8506d 100755
--- a/ca/rpki-confgen
+++ b/ca/rpki-confgen
@@ -38,254 +38,259 @@ xml8_wrapper = textwrap.TextWrapper(initial_indent = space8, subsequent_indent =
 
 class Option(object):
 
-  def __init__(self, name, value, doc):
-    self.name = name
-    self.value = value
-    self.doc = doc
-
-  @property
-  def width(self):
-    return len(self.name)
-
-  def to_xml(self):
-    x = Element("option", name = self.name)
-    if self.value is not None:
-      x.set("value", self.value)
-    for d in self.doc:
-      SubElement(x, "doc").text = "\n" + xml8_wrapper.fill(d) + "\n" + space6
-    return x
-
-  def to_wiki(self, f):
-    f.write("\n== %s == #%s\n" % (self.name, self.name))
-    for d in self.doc:
-      f.write("\n%s\n" % wiki_wrapper.fill(d))
-    if self.value is None:
-      f.write("\n%s\n" % wiki_wrapper.fill("No default value."))
-    else:
-      f.write("\n{{{\n#!ini\n%s = %s\n}}}\n" % (self.name, self.value))
-
-  def to_conf(self, f, width):
-    for i, d in enumerate(self.doc):
-      f.write("%s\n%s\n" % ("" if i == 0 else "#", conf_wrapper.fill(d)))
-    if self.value is None:
-      f.write("\n#%-*s = ???\n" % (width - 1, self.name))
-    else:
-      f.write("\n%-*s = %s\n" % (width, self.name, self.value))
+    def __init__(self, name, value, doc):
+        self.name = name
+        self.value = value
+        self.doc = doc
+
+    @property
+    def width(self):
+        return len(self.name)
+
+    def to_xml(self):
+        x = Element("option", name = self.name)
+        if self.value is not None:
+            x.set("value", self.value)
+        for d in self.doc:
+            SubElement(x, "doc").text = "\n" + xml8_wrapper.fill(d) + "\n" + space6
+        return x
+
+    def to_wiki(self, f):
+        f.write("\n== %s == #%s\n" % (self.name, self.name))
+        for d in self.doc:
+            f.write("\n%s\n" % wiki_wrapper.fill(d))
+        if self.value is None:
+            f.write("\n%s\n" % wiki_wrapper.fill("No default value."))
+        else:
+            f.write("\n{{{\n#!ini\n%s = %s\n}}}\n" % (self.name, self.value))
+
+    def to_conf(self, f, width):
+        for i, d in enumerate(self.doc):
+            f.write("%s\n%s\n" % ("" if i == 0 else "#", conf_wrapper.fill(d)))
+        if self.value is None:
+            f.write("\n#%-*s = ???\n" % (width - 1, self.name))
+        else:
+            f.write("\n%-*s = %s\n" % (width, self.name, self.value))
 
 class Section(object):
 
-  def __init__(self, name):
-    self.name = name
-    self.doc = []
-    self.options = []
-
-  @property
-  def width(self):
-    return max(o.width for o in self.options)
-
-  @classmethod
-  def from_xml(cls, elt):
-    self = cls(name = elt.get("name"))
-    for x in elt.iterchildren("doc"):
-      self.doc.append(" ".join(x.text.split()))
-    for x in elt.iterchildren("option"):
-      self.options.append(Option(name = x.get("name"), value = x.get("value"),
-                                 doc = [" ".join(d.text.split())
-                                        for d in x.iterchildren("doc")]))
-    return self
-
-  def to_xml(self):
-    x = Element("section", name = self.name)
-    for d in self.doc:
-      SubElement(x, "doc").text = "\n" + xml6_wrapper.fill(d) + "\n" + space4
-    x.extend(o.to_xml() for o in self.options)
-    return x
-
-  def to_wiki(self, f):
-    f.write("\n= [%s] section = #%s\n" % (self.name, self.name))
-    for d in self.doc:
-      f.write("\n%s\n" % wiki_wrapper.fill(d))
-    for o in self.options:
-      o.to_wiki(f)
-
-  def to_conf(self, f, width):
-    f.write("\n" + "#" * 78 + "\n\n[" + self.name + "]\n")
-    if self.doc:
-      f.write("\n##")
-      for i, d in enumerate(self.doc):
-        f.write("%s\n%s\n" % ("" if i == 0 else "#", conf_wrapper.fill(d)))
-      f.write("##\n")
-    for o in self.options:
-      o.to_conf(f, width)
+    def __init__(self, name):
+        self.name = name
+        self.doc = []
+        self.options = []
+
+    @property
+    def width(self):
+        return max(o.width for o in self.options)
+
+    @classmethod
+    def from_xml(cls, elt):
+        self = cls(name = elt.get("name"))
+        for x in elt.iterchildren("doc"):
+            self.doc.append(" ".join(x.text.split()))
+        for x in elt.iterchildren("option"):
+            self.options.append(Option(name = x.get("name"), value = x.get("value"),
+                                       doc = [" ".join(d.text.split())
+                                              for d in x.iterchildren("doc")]))
+        return self
+
+    def to_xml(self):
+        x = Element("section", name = self.name)
+        for d in self.doc:
+            SubElement(x, "doc").text = "\n" + xml6_wrapper.fill(d) + "\n" + space4
+        x.extend(o.to_xml() for o in self.options)
+        return x
+
+    def to_wiki(self, f):
+        f.write("\n= [%s] section = #%s\n" % (self.name, self.name))
+        for d in self.doc:
+            f.write("\n%s\n" % wiki_wrapper.fill(d))
+        for o in self.options:
+            o.to_wiki(f)
+
+    def to_conf(self, f, width):
+        f.write("\n" + "#" * 78 + "\n\n[" + self.name + "]\n")
+        if self.doc:
+            f.write("\n##")
+            for i, d in enumerate(self.doc):
+                f.write("%s\n%s\n" % ("" if i == 0 else "#", conf_wrapper.fill(d)))
+            f.write("##\n")
+        for o in self.options:
+            o.to_conf(f, width)
 
 def wiki_header(f, ident, toc):
-  f.write("\n".join((
-    "{{{",
-    "#!comment",
-    "",
-    star78,
-    "THIS PAGE WAS GENERATED AUTOMATICALLY, DO NOT EDIT.",
-    "",
-    "Generated from " + ident,
-    "            by $Id$",
-    star78,
-    "",
-    "}}}",
-    "")))
-  if toc is not None:
-    f.write("[[TracNav(%s)]]\n" % toc)
-  f.write("[[PageOutline]]\n")
+    f.write("\n".join((
+        "{{{",
+        "#!comment",
+        "",
+        star78,
+        "THIS PAGE WAS GENERATED AUTOMATICALLY, DO NOT EDIT.",
+        "",
+        "Generated from " + ident,
+        "            by $Id$",
+        star78,
+        "",
+        "}}}",
+        "")))
+    if toc is not None:
+        f.write("[[TracNav(%s)]]\n" % toc)
+    f.write("[[PageOutline]]\n")
 
 def conf_header(f, ident):
-  f.write("\n".join((
-    "# Automatically generated.  Edit as needed, but be careful of overwriting.",
-    "#",
-    "# Generated from " + ident,
-    "#             by $Id$",
-    "")))
+    f.write("\n".join((
+        "# Automatically generated.  Edit as needed, but be careful of overwriting.",
+        "#",
+        "# Generated from " + ident,
+        "#             by $Id$",
+        "")))
 
 
 # http://stackoverflow.com/questions/9027028/argparse-argument-order
 
 class CustomAction(argparse.Action):
-  def __call__(self, parser, namespace, values, option_string = None):
-    if not "ordered_args" in namespace:
-      namespace.ordered_args = []
-    namespace.ordered_args.append((self.dest, values))
+    def __call__(self, parser, namespace, values, option_string = None):
+        if not "ordered_args" in namespace:
+            namespace.ordered_args = []
+        namespace.ordered_args.append((self.dest, values))
 
 class CustomFlagAction(argparse.Action):
-  def __init__(self, option_strings, dest, default = None,
-               required = False, help = None): # pylint: disable=W0622
-    super(CustomFlagAction, self).__init__(
-      option_strings = option_strings, dest = dest, nargs = 0,
-      const = None, default = default, required = required, help = help)
-  def __call__(self, parser, namespace, values, option_string = None):
-    if not "ordered_args" in namespace:
-      namespace.ordered_args = []
-    namespace.ordered_args.append((self.dest, None))
+    def __init__(self, option_strings, dest, default = None,
+                 required = False, help = None): # pylint: disable=W0622
+        super(CustomFlagAction, self).__init__(
+            option_strings = option_strings,
+            dest           = dest,
+            nargs          = 0,
+            const          = None,
+            default        = default,
+            required       = required,
+            help           = help)
+    def __call__(self, parser, namespace, values, option_string = None):
+        if not "ordered_args" in namespace:
+            namespace.ordered_args = []
+        namespace.ordered_args.append((self.dest, None))
 
 
 class main(object):
 
-  def __init__(self):
-    self.sections = []
-    self.section_map = None
-    self.option_map = None
-    self.ident = None
-    self.toc = None
-
-    parser = argparse.ArgumentParser(description = __doc__)
-    parser.add_argument("--read-xml",   metavar = "FILE",  action = CustomAction,
-                        required = True, type = argparse.FileType("r"),
-                        help = "XML input file defining sections and options")
-    parser.add_argument("--write-xml",  metavar = "FILE",  action = CustomAction,
-                        help = "XML file to write")
-    parser.add_argument("--write-wiki", metavar = "FILE", action = CustomAction,
-                        help = "TracWiki file to write")
-    parser.add_argument("--write-conf", metavar = "FILE", action = CustomAction,
-                        help = "rpki.conf configuration file to write")
-    parser.add_argument("--set",        metavar = "VARVAL",    action = CustomAction,
-                        help = "variable setting in form \"VAR=VAL\"")
-    parser.add_argument("--pwgen",      metavar = "VAR",       action = CustomAction,
-                        help = "set variable to generated password")
-    parser.add_argument("--toc",        metavar = "TRACNAV",   action = CustomAction,
-                        help = "set TOC value to use with TracNav plugin")
-    parser.add_argument("--autoconf",   action = CustomFlagAction,
-                        help = "configure [autoconf] section")
-    args = parser.parse_args()
-
-    for cmd, arg in args.ordered_args:
-      getattr(self, "do_" + cmd)(arg)
-
-
-  def do_read_xml(self, arg):
-    self.option_map = None
-    root = ElementTree(file = arg).getroot()
-    self.ident = root.get("ident")
-    self.sections.extend(Section.from_xml(x) for x in root)
-    self.option_map = {}
-    self.section_map = {}
-    for section in self.sections:
-      if section.name in self.section_map:
-        sys.exit("Duplicate section %s" % section.name)
-      self.section_map[section.name] = section
-      for option in section.options:
-        name = (section.name, option.name)
-        if name in self.option_map:
-          sys.exit("Duplicate option %s::%s" % name)
-        self.option_map[name] = option
-
-
-  def do_set(self, arg):
-    try:
-      name, value = arg.split("=", 1)
-      section, option = name.split("::")
-    except ValueError:
-      sys.exit("Couldn't parse --set specification \"%s\"" % arg)
-    name = (section, option)
-    if name not in self.option_map:
-      sys.exit("Couldn't find option %s::%s" % name)
-    self.option_map[name].value = value
-
-
-  def do_pwgen(self, arg):
-    try:
-      section, option = arg.split("::")
-    except ValueError:
-      sys.exit("Couldn't parse --pwgen specification \"%s\"" % arg)
-    name = (section, option)
-    if name not in self.option_map:
-      sys.exit("Couldn't find option %s::%s" % name)
-    self.option_map[name].value = base64.urlsafe_b64encode(os.urandom(66))
-
-
-  def do_autoconf(self, ignored):
-    try:
-      import rpki.autoconf
-      for option in self.section_map["autoconf"].options:
+    def __init__(self):
+        self.sections = []
+        self.section_map = None
+        self.option_map = None
+        self.ident = None
+        self.toc = None
+
+        parser = argparse.ArgumentParser(description = __doc__)
+        parser.add_argument("--read-xml",   metavar = "FILE",  action = CustomAction,
+                            required = True, type = argparse.FileType("r"),
+                            help = "XML input file defining sections and options")
+        parser.add_argument("--write-xml",  metavar = "FILE",  action = CustomAction,
+                            help = "XML file to write")
+        parser.add_argument("--write-wiki", metavar = "FILE", action = CustomAction,
+                            help = "TracWiki file to write")
+        parser.add_argument("--write-conf", metavar = "FILE", action = CustomAction,
+                            help = "rpki.conf configuration file to write")
+        parser.add_argument("--set",        metavar = "VARVAL",    action = CustomAction,
+                            help = "variable setting in form \"VAR=VAL\"")
+        parser.add_argument("--pwgen",      metavar = "VAR",       action = CustomAction,
+                            help = "set variable to generated password")
+        parser.add_argument("--toc",        metavar = "TRACNAV",   action = CustomAction,
+                            help = "set TOC value to use with TracNav plugin")
+        parser.add_argument("--autoconf",   action = CustomFlagAction,
+                            help = "configure [autoconf] section")
+        args = parser.parse_args()
+
+        for cmd, arg in args.ordered_args:
+            getattr(self, "do_" + cmd)(arg)
+
+
+    def do_read_xml(self, arg):
+        self.option_map = None
+        root = ElementTree(file = arg).getroot()
+        self.ident = root.get("ident")
+        self.sections.extend(Section.from_xml(x) for x in root)
+        self.option_map = {}
+        self.section_map = {}
+        for section in self.sections:
+            if section.name in self.section_map:
+                sys.exit("Duplicate section %s" % section.name)
+            self.section_map[section.name] = section
+            for option in section.options:
+                name = (section.name, option.name)
+                if name in self.option_map:
+                    sys.exit("Duplicate option %s::%s" % name)
+                self.option_map[name] = option
+
+
+    def do_set(self, arg):
         try:
-          option.value = getattr(rpki.autoconf, option.name)
-        except AttributeError:
-          pass
-    except ImportError:
-      sys.exit("rpki.autoconf module is not available")
-    except KeyError:
-      sys.exit("Couldn't find autoconf section")
+            name, value = arg.split("=", 1)
+            section, option = name.split("::")
+        except ValueError:
+            sys.exit("Couldn't parse --set specification \"%s\"" % arg)
+        name = (section, option)
+        if name not in self.option_map:
+            sys.exit("Couldn't find option %s::%s" % name)
+        self.option_map[name].value = value
 
 
-  def do_write_xml(self, arg):
-    x = Element("configuration", ident = self.ident)
-    x.extend(s.to_xml() for s in self.sections)
-    ElementTree(x).write(arg, pretty_print = True, encoding = "us-ascii")
-
-
-  def do_write_wiki(self, arg):
-    if "%" in arg:
-      for section in self.sections:
-        with open(arg % section.name, "w") as f:
-          wiki_header(f, self.ident, self.toc)
-          section.to_wiki(f)
-    else:
-      with open(arg, "w") as f:
-        for i, section in enumerate(self.sections):
-          if i == 0:
-            wiki_header(f, self.ident, self.toc)
-          else:
-            f.write("\f\n")
-          section.to_wiki(f)
-
-
-  def do_write_conf(self, arg):
-    with open(arg, "w") as f:
-      conf_header(f, self.ident)
-      width = max(s.width for s in self.sections)
-      for section in self.sections:
-        section.to_conf(f, width)
+    def do_pwgen(self, arg):
+        try:
+            section, option = arg.split("::")
+        except ValueError:
+            sys.exit("Couldn't parse --pwgen specification \"%s\"" % arg)
+        name = (section, option)
+        if name not in self.option_map:
+            sys.exit("Couldn't find option %s::%s" % name)
+        self.option_map[name].value = base64.urlsafe_b64encode(os.urandom(66))
 
 
-  def do_toc(self, arg):
-    self.toc = arg
+    def do_autoconf(self, ignored):
+        try:
+            import rpki.autoconf
+            for option in self.section_map["autoconf"].options:
+                try:
+                    option.value = getattr(rpki.autoconf, option.name)
+                except AttributeError:
+                    pass
+        except ImportError:
+            sys.exit("rpki.autoconf module is not available")
+        except KeyError:
+            sys.exit("Couldn't find autoconf section")
+
+
+    def do_write_xml(self, arg):
+        x = Element("configuration", ident = self.ident)
+        x.extend(s.to_xml() for s in self.sections)
+        ElementTree(x).write(arg, pretty_print = True, encoding = "us-ascii")
+
+
+    def do_write_wiki(self, arg):
+        if "%" in arg:
+            for section in self.sections:
+                with open(arg % section.name, "w") as f:
+                    wiki_header(f, self.ident, self.toc)
+                    section.to_wiki(f)
+        else:
+            with open(arg, "w") as f:
+                for i, section in enumerate(self.sections):
+                    if i == 0:
+                        wiki_header(f, self.ident, self.toc)
+                    else:
+                        f.write("\f\n")
+                    section.to_wiki(f)
+
+
+    def do_write_conf(self, arg):
+        with open(arg, "w") as f:
+            conf_header(f, self.ident)
+            width = max(s.width for s in self.sections)
+            for section in self.sections:
+                section.to_conf(f, width)
+
+
+    def do_toc(self, arg):
+        self.toc = arg
 
 
 if __name__ == "__main__":
-  main()
+    main()