diff options
Diffstat (limited to 'myrpki')
| -rw-r--r-- | myrpki/myrpki.py | 8 | ||||
| -rw-r--r-- | myrpki/myrpki.rng | 2 | ||||
| -rw-r--r-- | myrpki/yamltest.py | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/myrpki/myrpki.py b/myrpki/myrpki.py index a67ce15e..9dbb4ebd 100644 --- a/myrpki/myrpki.py +++ b/myrpki/myrpki.py @@ -737,7 +737,6 @@ class CA(object): finally: if not filename and os.path.exists(fn): os.unlink(fn) - pass def xcert(self, cert, path_restriction = 0): """ @@ -1325,7 +1324,7 @@ class main(rpki.cli.Cmd): try: import rpki.https, rpki.resource_set, rpki.relaxng, rpki.exceptions - import rpki.left_right, rpki.x509, rpki.async, lxml.etree + import rpki.left_right, rpki.x509, rpki.async if hasattr(warnings, "catch_warnings"): with warnings.catch_warnings(): warnings.simplefilter("ignore", DeprecationWarning) @@ -1409,8 +1408,6 @@ class main(rpki.cli.Cmd): xmlfiles.extend(argv) - my_handle = None - for xmlfile in xmlfiles: # Parse XML file and validate it against our scheme @@ -1419,9 +1416,6 @@ class main(rpki.cli.Cmd): handle = tree.get("handle") - if xmlfile == my_xmlfile: - my_handle = handle - # Update IRDB with parsed resource and roa-request data. cur.execute( diff --git a/myrpki/myrpki.rng b/myrpki/myrpki.rng index dc4f18e6..111b5ed0 100644 --- a/myrpki/myrpki.rng +++ b/myrpki/myrpki.rng @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - $Id: myrpki.rnc 3105 2010-03-16 22:24:19Z sra $ + $Id: myrpki.rnc 3187 2010-04-12 17:56:03Z sra $ RelaxNG Schema for MyRPKI XML messages. diff --git a/myrpki/yamltest.py b/myrpki/yamltest.py index 08153209..f6a82e09 100644 --- a/myrpki/yamltest.py +++ b/myrpki/yamltest.py @@ -45,7 +45,7 @@ PERFORMANCE OF THIS SOFTWARE. """ -import subprocess, csv, re, os, getopt, sys, base64, yaml, signal, errno, time +import subprocess, re, os, getopt, sys, yaml, signal, time import rpki.resource_set, rpki.sundial, rpki.config, rpki.log, myrpki # Nasty regular expressions for parsing config files. Sadly, while |