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

diff --git a/potpourri/csvgrep.py b/potpourri/csvgrep.py
index 68bdd259..3d558245 100644
--- a/potpourri/csvgrep.py
+++ b/potpourri/csvgrep.py
@@ -1,11 +1,11 @@
 # $Id$
-# 
+#
 # Copyright (C) 2010-2012  Internet Systems Consortium ("ISC")
-# 
+#
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notice and this permission notice appear in all copies.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
 # REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 # AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
@@ -37,36 +37,36 @@ ipv4 = resource_set_ipv4()
 ipv6 = resource_set_ipv6()
 
 for datum in sys.argv[1:]:
-  if datum.replace("-", "").isdigit():
-    t = asn
-  else:
-    t = ipv6 if ":" in datum else ipv4
-    if "-" not in datum and "/" not in datum:
-      datum = datum + "-" + datum
-  try:
-    t.append(t.parse_str(datum))
-  except:
-    print "Error attempting to parse", datum
-    raise
+    if datum.replace("-", "").isdigit():
+        t = asn
+    else:
+        t = ipv6 if ":" in datum else ipv4
+        if "-" not in datum and "/" not in datum:
+            datum = datum + "-" + datum
+    try:
+        t.append(t.parse_str(datum))
+    except:
+        print "Error attempting to parse", datum
+        raise
 
 #print "Looking for: ASNs %s IPv4 %s IPv6 %s" % (asn, ipv4, ipv6)
 
 def matches(set1, datum):
-  set2 = set1.__class__(datum)
-  if set1.intersection(set2):
-    return set2
-  else:
-    return False
+    set2 = set1.__class__(datum)
+    if set1.intersection(set2):
+        return set2
+    else:
+        return False
 
 if asn:
-  for h, a in csv_reader("asns.csv", columns = 2):
-    m = matches(asn, a)
-    if m:
-      print h, m
+    for h, a in csv_reader("asns.csv", columns = 2):
+        m = matches(asn, a)
+        if m:
+            print h, m
 
 if ipv4 or ipv6:
-  for h, a in csv_reader("prefixes.csv", columns = 2):
-    t = ipv6 if ":" in a else ipv4
-    m = t and matches(t, a)
-    if m:
-      print h, m
+    for h, a in csv_reader("prefixes.csv", columns = 2):
+        t = ipv6 if ":" in a else ipv4
+        m = t and matches(t, a)
+        if m:
+            print h, m