Reorganize, because otherwise we're going to have far too many scripts

for anybody to understand.

svn path=/myrpki.rototill/cherrypy-example.py; revision=3009

1 files changed, 3 insertions, 2 deletions

diff --git a/myrpki.rototill/myrpki.py b/myrpki.rototill/myrpki.py
index 6ea1a6c4..aaf5c53d 100644
--- a/myrpki.rototill/myrpki.py
+++ b/myrpki.rototill/myrpki.py
@@ -374,7 +374,7 @@ def csv_open(filename):
   """
   return csv.reader(open(filename, "rb"), dialect = csv_dialect)
 
-def PEMElement(e, tag, filename):
+def PEMElement(e, tag, filename, **kwargs):
   """
   Create an XML element containing Base64 encoded data taken from a
   PEM file.
@@ -388,9 +388,10 @@ def PEMElement(e, tag, filename):
       break
   if e.text is None:
     e.text = "\n"
-  se = SubElement(e, tag)
+  se = SubElement(e, tag, **kwargs)
   se.text = "\n" + "".join(lines)
   se.tail = "\n"
+  return se
 
 class CA(object):
   """