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

diff --git a/potpourri/analyze-transition.py b/potpourri/analyze-transition.py
index e2125dfb..9f7928dc 100644
--- a/potpourri/analyze-transition.py
+++ b/potpourri/analyze-transition.py
@@ -1,11 +1,11 @@
 # $Id$
-# 
+#
 # Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
-# 
+#
 # Permission to use, copy, modify, and/or 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,
@@ -21,44 +21,44 @@ Compare rcynic.xml files, tell the user what became invalid, and why.
 import sys
 
 try:
-  from lxml.etree            import ElementTree
+    from lxml.etree            import ElementTree
 except ImportError:
-  from xml.etree.ElementTree import ElementTree
+    from xml.etree.ElementTree import ElementTree
 
 class Object(object):
 
-  def __init__(self, session, uri):
-    self.session = session
-    self.uri = uri
-    self.labels = []
+    def __init__(self, session, uri):
+        self.session = session
+        self.uri = uri
+        self.labels = []
 
-  def add(self, label):
-    self.labels.append(label)
+    def add(self, label):
+        self.labels.append(label)
 
-  def __cmp__(self, other):
-    return cmp(self.labels, other.labels)
+    def __cmp__(self, other):
+        return cmp(self.labels, other.labels)
 
-  @property
-  def accepted(self):
-    return "object_accepted" in self.labels
+    @property
+    def accepted(self):
+        return "object_accepted" in self.labels
 
 class Session(dict):
 
-  def __init__(self, name):
-    self.name = name
-    tree = ElementTree(file = name)
-    labels = tuple((elt.tag.strip(), elt.text.strip()) for elt in tree.find("labels"))
-    self.labels = tuple(pair[0] for pair in labels)
-    self.descrs = dict(labels)
-    self.date = tree.getroot().get("date")
-    for elt in tree.findall("validation_status"):
-      status = elt.get("status")
-      uri = elt.text.strip()
-      if status.startswith("rsync_transfer_") or elt.get("generation") != "current":
-        continue
-      if uri not in self:
-        self[uri] = Object(self, uri)
-      self[uri].add(status)
+    def __init__(self, name):
+        self.name = name
+        tree = ElementTree(file = name)
+        labels = tuple((elt.tag.strip(), elt.text.strip()) for elt in tree.find("labels"))
+        self.labels = tuple(pair[0] for pair in labels)
+        self.descrs = dict(labels)
+        self.date = tree.getroot().get("date")
+        for elt in tree.findall("validation_status"):
+            status = elt.get("status")
+            uri = elt.text.strip()
+            if status.startswith("rsync_transfer_") or elt.get("generation") != "current":
+                continue
+            if uri not in self:
+                self[uri] = Object(self, uri)
+            self[uri].add(status)
 
 skip_labels = frozenset(("object_accepted", "object_rejected"))
 
@@ -66,23 +66,23 @@ old_db = new_db = None
 
 for arg in sys.argv[1:]:
 
-  old_db = new_db
-  new_db = Session(arg)
-  if old_db is None:
-    continue
-
-  old_uris = frozenset(old_db)
-  new_uris = frozenset(new_db)
-
-  for uri in sorted(old_uris - new_uris):
-    print new_db.date, uri, "dropped"
-
-  for uri in sorted(old_uris & new_uris):
-    old = old_db[uri]
-    new = new_db[uri]
-    if old.accepted and not new.accepted:
-      print new_db.date, uri, "invalid"
-      labels = frozenset(new.labels) - frozenset(old.labels) - skip_labels
-      for label in new.labels:
-        if label in labels:
-          print " ", new_db.descrs[label]
+    old_db = new_db
+    new_db = Session(arg)
+    if old_db is None:
+        continue
+
+    old_uris = frozenset(old_db)
+    new_uris = frozenset(new_db)
+
+    for uri in sorted(old_uris - new_uris):
+        print new_db.date, uri, "dropped"
+
+    for uri in sorted(old_uris & new_uris):
+        old = old_db[uri]
+        new = new_db[uri]
+        if old.accepted and not new.accepted:
+            print new_db.date, uri, "invalid"
+            labels = frozenset(new.labels) - frozenset(old.labels) - skip_labels
+            for label in new.labels:
+                if label in labels:
+                    print " ", new_db.descrs[label]