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

diff --git a/ca/tests/xml-parse-test.py b/ca/tests/xml-parse-test.py
index 90c80775..f24d5683 100644
--- a/ca/tests/xml-parse-test.py
+++ b/ca/tests/xml-parse-test.py
@@ -39,70 +39,70 @@ import rpki.relaxng
 verbose = False
 
 def test(fileglob, rng, parser, encoding, tester = None):
-  files = glob.glob(fileglob)
-  files.sort()
-  for f in files:
-    print "<!--", f, "-->"
-    elt_in = lxml.etree.parse(f).getroot()
-    if verbose:
-      print "<!-- Input -->"
-      print lxml.etree.tostring(elt_in, pretty_print = True, encoding = encoding, xml_declaration = True)
-    rng.assertValid(elt_in)
-    parsed  = parser.fromXML(elt_in)
-    elt_out = parsed.toXML()
-    if verbose:
-      print "<!-- Output -->"
-      print lxml.etree.tostring(elt_out, pretty_print = True, encoding = encoding, xml_declaration = True)
-    rng.assertValid(elt_out)
-    if tester:
-      tester(elt_in, elt_out, parsed)
-    if verbose:
-      print
+    files = glob.glob(fileglob)
+    files.sort()
+    for f in files:
+        print "<!--", f, "-->"
+        elt_in = lxml.etree.parse(f).getroot()
+        if verbose:
+            print "<!-- Input -->"
+            print lxml.etree.tostring(elt_in, pretty_print = True, encoding = encoding, xml_declaration = True)
+        rng.assertValid(elt_in)
+        parsed  = parser.fromXML(elt_in)
+        elt_out = parsed.toXML()
+        if verbose:
+            print "<!-- Output -->"
+            print lxml.etree.tostring(elt_out, pretty_print = True, encoding = encoding, xml_declaration = True)
+        rng.assertValid(elt_out)
+        if tester:
+            tester(elt_in, elt_out, parsed)
+        if verbose:
+            print
 
 def pprint(pairs):
-  if verbose:
-    for thing, name in pairs:
-      if thing is not None:
-        print "[%s]" % name
-        print thing.get_POW().pprint()
+    if verbose:
+        for thing, name in pairs:
+            if thing is not None:
+                print "[%s]" % name
+                print thing.get_POW().pprint()
 
 def ud_tester(elt_in, elt_out, msg):
-  assert isinstance(msg, rpki.up_down.message_pdu)
-  if isinstance(msg.payload, rpki.up_down.list_response_pdu):
-    for c in msg.payload.classes:
-      pprint([(c.certs[i].cert, ("%s certificate #%d" % (c.class_name, i))) for i in xrange(len(c.certs))] + [(c.issuer, ("%s issuer" % c.class_name))])
+    assert isinstance(msg, rpki.up_down.message_pdu)
+    if isinstance(msg.payload, rpki.up_down.list_response_pdu):
+        for c in msg.payload.classes:
+            pprint([(c.certs[i].cert, ("%s certificate #%d" % (c.class_name, i))) for i in xrange(len(c.certs))] + [(c.issuer, ("%s issuer" % c.class_name))])
 
 def lr_tester(elt_in, elt_out, msg):
-  assert isinstance(msg, rpki.left_right.msg)
-  for obj in msg:
-    if isinstance(obj, rpki.left_right.self_elt):
-      pprint(((obj.bpki_cert,         "BPKI cert"),
-              (obj.bpki_glue,         "BPKI glue")))
-    if isinstance(obj, rpki.left_right.bsc_elt):
-      pprint(((obj.signing_cert,      "Signing certificate"),
-              (obj.signing_cert_crl,  "Signing certificate CRL")))
-      #       (obj.pkcs10_request,    "PKCS #10 request")
-    if isinstance(obj, rpki.left_right.parent_elt):
-      pprint(((obj.bpki_cert,         "BPKI certificate"),
-              (obj.bpki_glue,         "BPKI glue")))
-    if isinstance(obj, (rpki.left_right.child_elt, rpki.left_right.repository_elt)):
-      pprint(((obj.bpki_cert,         "BPKI certificate"),
-              (obj.bpki_glue,         "BPKI glue")))
+    assert isinstance(msg, rpki.left_right.msg)
+    for obj in msg:
+        if isinstance(obj, rpki.left_right.self_elt):
+            pprint(((obj.bpki_cert,         "BPKI cert"),
+                    (obj.bpki_glue,         "BPKI glue")))
+        if isinstance(obj, rpki.left_right.bsc_elt):
+            pprint(((obj.signing_cert,      "Signing certificate"),
+                    (obj.signing_cert_crl,  "Signing certificate CRL")))
+            #       (obj.pkcs10_request,    "PKCS #10 request")
+        if isinstance(obj, rpki.left_right.parent_elt):
+            pprint(((obj.bpki_cert,         "BPKI certificate"),
+                    (obj.bpki_glue,         "BPKI glue")))
+        if isinstance(obj, (rpki.left_right.child_elt, rpki.left_right.repository_elt)):
+            pprint(((obj.bpki_cert,         "BPKI certificate"),
+                    (obj.bpki_glue,         "BPKI glue")))
 
 def pp_tester(elt_in, elt_out, msg):
-  assert isinstance(msg, rpki.publication.msg)
-  for obj in msg:
-    if isinstance(obj, rpki.publication.publish_elt):
-      pprint(((obj.payload,          "Publish object"),))
-    if isinstance(obj, rpki.publication.withdraw_elt):
-      pprint(((None,                 "Withdraw object"),))
+    assert isinstance(msg, rpki.publication.msg)
+    for obj in msg:
+        if isinstance(obj, rpki.publication.publish_elt):
+            pprint(((obj.payload,          "Publish object"),))
+        if isinstance(obj, rpki.publication.withdraw_elt):
+            pprint(((None,                 "Withdraw object"),))
 
 def pc_tester(elt_in, elt_out, msg):
-  assert isinstance(msg, rpki.publication_control.msg)
-  for obj in msg:
-    if isinstance(obj, rpki.publication_control.client_elt):
-      pprint(((obj.bpki_cert,         "BPKI cert"),
-              (obj.bpki_glue,         "BPKI glue")))
+    assert isinstance(msg, rpki.publication_control.msg)
+    for obj in msg:
+        if isinstance(obj, rpki.publication_control.client_elt):
+            pprint(((obj.bpki_cert,         "BPKI cert"),
+                    (obj.bpki_glue,         "BPKI glue")))
 
 test(fileglob = "up-down-protocol-samples/*.xml",
      rng = rpki.relaxng.up_down,