From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 23 Jan 2009 23:04:28 +0000 (+0100)
Subject: utils.py
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=fea9062ae003a8fe3790d15f936d598df990103b;p=dak.git

utils.py

eliminate pychecker warning "shadows builtin input|file|hash"

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/daklib/utils.py b/daklib/utils.py
index a50a840f..f07b6171 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -398,25 +398,24 @@ def parse_checksums(where, files, manifest, hashname):
     field = 'checksums-%s' % hashname
     if not field in manifest:
         return rejmsg
-    input = manifest[field]
-    for line in input.split('\n'):
+    for line in manifest[field].split('\n'):
         if not line:
             break
-        hash, size, file = line.strip().split(' ')
-        if not files.has_key(file):
+        checksum, size, checkfile = line.strip().split(' ')
+        if not files.has_key(checkfile):
         # TODO: check for the file's entry in the original files dict, not
         # the one modified by (auto)byhand and other weird stuff
         #    rejmsg.append("%s: not present in files but in checksums-%s in %s" %
         #        (file, hashname, where))
             continue
-        if not files[file]["size"] == size:
+        if not files[checkfile]["size"] == size:
             rejmsg.append("%s: size differs for files and checksums-%s entry "\
-                "in %s" % (file, hashname, where))
+                "in %s" % (checkfile, hashname, where))
             continue
-        files[file][hash_key(hashname)] = hash
+        files[checkfile][hash_key(hashname)] = checksum
     for f in files.keys():
         if not files[f].has_key(hash_key(hashname)):
-            rejmsg.append("%s: no entry in checksums-%s in %s" % (file,
+            rejmsg.append("%s: no entry in checksums-%s in %s" % (checkfile,
                 hashname, where))
     return rejmsg