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

diff --git a/potpourri/show-key-identifiers.py b/potpourri/show-key-identifiers.py
index fa2bae8b..4ba6219a 100644
--- a/potpourri/show-key-identifiers.py
+++ b/potpourri/show-key-identifiers.py
@@ -29,26 +29,26 @@ import rpki.oids
 
 
 def check_dir(s):
-  if os.path.isdir(s):
-    return os.path.abspath(s)
-  else:
-    raise argparse.ArgumentTypeError("%r is not a directory" % s)
+    if os.path.isdir(s):
+        return os.path.abspath(s)
+    else:
+        raise argparse.ArgumentTypeError("%r is not a directory" % s)
 
 
 def filename_to_uri(filename):
-  if not filename.startswith(args.rcynic_dir):
-    raise ValueError
-  return "rsync://" + filename[len(args.rcynic_dir):].lstrip("/")
+    if not filename.startswith(args.rcynic_dir):
+        raise ValueError
+    return "rsync://" + filename[len(args.rcynic_dir):].lstrip("/")
 
 
 def get_roa(fn):
-  return rpki.POW.CMS.derReadFile(fn).certs()[0]
+    return rpki.POW.CMS.derReadFile(fn).certs()[0]
 
 def get_crl(fn):
-  return rpki.POW.CRL.derReadFile(fn)
+    return rpki.POW.CRL.derReadFile(fn)
 
 def get_cer(fn):
-  return rpki.POW.X509.derReadFile(fn)
+    return rpki.POW.X509.derReadFile(fn)
 
 dispatch = dict(roa = get_roa,
                 crl = get_crl,
@@ -59,23 +59,23 @@ parser.add_argument("rcynic_dir", type = check_dir, help = "rcynic authenticated
 args = parser.parse_args()
 
 for root, dirs, files in os.walk(args.rcynic_dir):
-  for fn in files:
-    fn = os.path.join(root, fn)
-    fn2 = os.path.splitext(fn)[1][1:]
-    if fn2 not in dispatch:
-      continue
-    obj = dispatch[fn2](fn)
-    uri = filename_to_uri(fn)
-    try:
-      ski = obj.getSKI().encode("hex")
-    except:
-      ski = ""
-    try:
-      aki = obj.getAKI().encode("hex")
-    except:
-      aki = ""
-    try:
-      res = ",".join(",".join("%s-%s" % r2 for r2 in r1) for r1 in obj.getRFC3779() if r1 is not None)
-    except:
-      res = ""
-    print "\t".join((uri, ski, aki, res))
+    for fn in files:
+        fn = os.path.join(root, fn)
+        fn2 = os.path.splitext(fn)[1][1:]
+        if fn2 not in dispatch:
+            continue
+        obj = dispatch[fn2](fn)
+        uri = filename_to_uri(fn)
+        try:
+            ski = obj.getSKI().encode("hex")
+        except:
+            ski = ""
+        try:
+            aki = obj.getAKI().encode("hex")
+        except:
+            aki = ""
+        try:
+            res = ",".join(",".join("%s-%s" % r2 for r2 in r1) for r1 in obj.getRFC3779() if r1 is not None)
+        except:
+            res = ""
+        print "\t".join((uri, ski, aki, res))