Move into the 21st century by fixing some pylint warnings.

redo-stamp.py

@@ -3,51 +3,58 @@ import sys, os
 import vars, state
 from logs import err, debug2
 
-if len(sys.argv) > 1:
-    err('%s: no arguments expected.\n' % sys.argv[0])
-    sys.exit(1)
 
-if os.isatty(0):
-    err('%s: you must provide the data to stamp on stdin\n' % sys.argv[0])
-    sys.exit(1)
+def main():
+    if len(sys.argv) > 1:
+        err('%s: no arguments expected.\n' % sys.argv[0])
+        sys.exit(1)
 
-# hashlib is only available in python 2.5 or higher, but the 'sha' module
-# produces a DeprecationWarning in python 2.6 or higher.  We want to support
-# python 2.4 and above without any stupid warnings, so let's try using hashlib
-# first, and downgrade if it fails.
-try:
-    import hashlib
-except ImportError:
-    import sha
-    sh = sha.sha()
-else:
-    sh = hashlib.sha1()
+    if os.isatty(0):
+        err('%s: you must provide the data to stamp on stdin\n' % sys.argv[0])
+        sys.exit(1)
 
-while 1:
-    b = os.read(0, 4096)
-    sh.update(b)
-    if not b: break
+    # hashlib is only available in python 2.5 or higher, but the 'sha'
+    # module produces a DeprecationWarning in python 2.6 or higher.  We want
+    # to support python 2.4 and above without any stupid warnings, so let's
+    # try using hashlib first, and downgrade if it fails.
+    try:
+        import hashlib
+    except ImportError:
+        import sha
+        sh = sha.sha()
+    else:
+        sh = hashlib.sha1()
 
-csum = sh.hexdigest()
+    while 1:
+        b = os.read(0, 4096)
+        sh.update(b)
+        if not b:
+            break
 
-if not vars.TARGET:
-    sys.exit(0)
+    csum = sh.hexdigest()
 
-me = os.path.join(vars.STARTDIR, 
-                  os.path.join(vars.PWD, vars.TARGET))
-f = state.File(name=me)
-changed = (csum != f.csum)
-debug2('%s: old = %s\n' % (f.name, f.csum))
-debug2('%s: sum = %s (%s)\n' % (f.name, csum,
-                                changed and 'changed' or 'unchanged'))
-f.is_generated = True
-f.is_override = False
-f.failed_runid = None
-if changed:
-    f.set_changed()  # update_stamp might not do this if the mtime is identical
-    f.csum = csum
-else:
-    # unchanged
-    f.set_checked()
-f.save()
-state.commit()
+    if not vars.TARGET:
+        sys.exit(0)
+
+    me = os.path.join(vars.STARTDIR,
+                      os.path.join(vars.PWD, vars.TARGET))
+    f = state.File(name=me)
+    changed = (csum != f.csum)
+    debug2('%s: old = %s\n' % (f.name, f.csum))
+    debug2('%s: sum = %s (%s)\n' % (f.name, csum,
+                                    changed and 'changed' or 'unchanged'))
+    f.is_generated = True
+    f.is_override = False
+    f.failed_runid = None
+    if changed:
+        f.set_changed()  # update_stamp might skip this if mtime is identical
+        f.csum = csum
+    else:
+        # unchanged
+        f.set_checked()
+    f.save()
+    state.commit()
+
+
+if __name__ == '__main__':
+    main()