"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, 37 insertions, 37 deletions

diff --git a/ca/tests/myrpki-xml-parse-test.py b/ca/tests/myrpki-xml-parse-test.py
index 9db7ec57..d915ea5b 100644
--- a/ca/tests/myrpki-xml-parse-test.py
+++ b/ca/tests/myrpki-xml-parse-test.py
@@ -25,77 +25,77 @@ relaxng = lxml.etree.RelaxNG(file = "myrpki.rng")
 tree = lxml.etree.parse("myrpki.xml").getroot()
 
 if False:
-  print lxml.etree.tostring(tree, pretty_print = True, encoding = "us-ascii", xml_declaration = True)
+    print lxml.etree.tostring(tree, pretty_print = True, encoding = "us-ascii", xml_declaration = True)
 
 relaxng.assertValid(tree)
 
 def showitems(y):
-  if False:
-    for k, v in y.items():
-      if v:
-        print " ", k, v
+    if False:
+        for k, v in y.items():
+            if v:
+                print " ", k, v
 
 def tag(t):
-  return "{http://www.hactrn.net/uris/rpki/myrpki/}" + t
+    return "{http://www.hactrn.net/uris/rpki/myrpki/}" + t
 
 print "My handle:", tree.get("handle")
 
 print "Children:"
 for x in tree.getiterator(tag("child")):
-  print " ", x
-  print "  Handle:", x.get("handle")
-  print "  ASNS:  ", rpki.resource_set.resource_set_as(x.get("asns"))
-  print "  IPv4:  ", rpki.resource_set.resource_set_ipv4(x.get("v4"))
-  print "  Valid: ", x.get("valid_until")
-  showitems(x)
+    print " ", x
+    print "  Handle:", x.get("handle")
+    print "  ASNS:  ", rpki.resource_set.resource_set_as(x.get("asns"))
+    print "  IPv4:  ", rpki.resource_set.resource_set_ipv4(x.get("v4"))
+    print "  Valid: ", x.get("valid_until")
+    showitems(x)
 print
 
 print "ROA requests:"
 for x in tree.getiterator(tag("roa_request")):
-  print " ", x
-  print "  ASN: ", x.get("asn")
-  print "  IPv4:", rpki.resource_set.roa_prefix_set_ipv4(x.get("v4"))
-  print "  IPv6:", rpki.resource_set.roa_prefix_set_ipv6(x.get("v6"))
-  showitems(x)
+    print " ", x
+    print "  ASN: ", x.get("asn")
+    print "  IPv4:", rpki.resource_set.roa_prefix_set_ipv4(x.get("v4"))
+    print "  IPv6:", rpki.resource_set.roa_prefix_set_ipv6(x.get("v6"))
+    showitems(x)
 print
 
 def showpem(label, b64, kind):
-  cmd = ("openssl", kind, "-noout", "-text", "-inform", "DER")
-  if kind == "x509":
-    cmd += ("-certopt", "no_pubkey,no_sigdump")
-  p = subprocess.Popen(cmd, stdin = subprocess.PIPE, stdout = subprocess.PIPE)
-  text = p.communicate(input = base64.b64decode(b64))[0]
-  if p.returncode != 0:
-    raise subprocess.CalledProcessError(returncode = p.returncode, cmd = cmd)
-  print label, text
+    cmd = ("openssl", kind, "-noout", "-text", "-inform", "DER")
+    if kind == "x509":
+        cmd += ("-certopt", "no_pubkey,no_sigdump")
+    p = subprocess.Popen(cmd, stdin = subprocess.PIPE, stdout = subprocess.PIPE)
+    text = p.communicate(input = base64.b64decode(b64))[0]
+    if p.returncode != 0:
+        raise subprocess.CalledProcessError(returncode = p.returncode, cmd = cmd)
+    print label, text
 
 for x in tree.getiterator(tag("child")):
-  cert = x.findtext(tag("bpki_certificate"))
-  if cert:
-    showpem("Child", cert, "x509")
+    cert = x.findtext(tag("bpki_certificate"))
+    if cert:
+        showpem("Child", cert, "x509")
 
 for x in tree.getiterator(tag("parent")):
-  print "Parent URI:", x.get("service_uri")
-  cert = x.findtext(tag("bpki_certificate"))
-  if cert:
-    showpem("Parent", cert, "x509")
+    print "Parent URI:", x.get("service_uri")
+    cert = x.findtext(tag("bpki_certificate"))
+    if cert:
+        showpem("Parent", cert, "x509")
 
 ca = tree.findtext(tag("bpki_ca_certificate"))
 if ca:
-  showpem("CA", ca, "x509")
+    showpem("CA", ca, "x509")
 
 bsc = tree.findtext(tag("bpki_bsc_certificate"))
 if bsc:
-  showpem("BSC EE", bsc, "x509")
+    showpem("BSC EE", bsc, "x509")
 
 repo = tree.findtext(tag("bpki_repository_certificate"))
 if repo:
-  showpem("Repository", repo, "x509")
+    showpem("Repository", repo, "x509")
 
 req = tree.findtext(tag("bpki_bsc_pkcs10"))
 if req:
-  showpem("BSC EE", req, "req")
+    showpem("BSC EE", req, "req")
 
 crl = tree.findtext(tag("bpki_crl"))
 if crl:
-  showpem("CA", crl, "crl")
+    showpem("CA", crl, "crl")