PyLint. As usual, a lot of noise and a handful of real, albeit minor, bugs.

svn path=/branches/tk705/; revision=6123

4 files changed, 17 insertions, 17 deletions

diff --git a/rp/utils/find_roa b/rp/utils/find_roa
index 4cfcccac..2b537bf4 100755
--- a/rp/utils/find_roa
+++ b/rp/utils/find_roa
@@ -61,7 +61,7 @@ class Prefix(object):
     if self.prefix & ((1 << (self.prefix.bits - self.length)) - 1) != 0:
       raise ValueError
 
-  def matches(self, roa):
+  def matches(self, roa):               # pylint: disable=W0621
     return any(self.prefix == prefix and
                self.length == length and
                (not args.match_maxlength or
@@ -71,13 +71,13 @@ class Prefix(object):
                for prefix, length, maxlength in roa.prefixes)
 
 
-class ROA(rpki.POW.ROA):
+class ROA(rpki.POW.ROA):                # pylint: disable=W0232
   """
   Aspects of a ROA that we care about.
   """
 
   @classmethod
-  def parse(cls, fn):
+  def parse(cls, fn):                   # pylint: disable=W0621
     assert fn.startswith(args.rcynic_dir)
     self = cls.derReadFile(fn)
     self.fn = fn
@@ -112,7 +112,7 @@ class ROA(rpki.POW.ROA):
   def show_expiration(self):
     print self
     x = self.certs()[0]
-    fn = self.fn
+    fn = self.fn                        # pylint: disable=W0621
     uri = self.uri
     while uri is not None:
       name = fn if args.show_filenames else uri
diff --git a/rp/utils/print_roa b/rp/utils/print_roa
index d5db0c3c..c96a7c66 100755
--- a/rp/utils/print_roa
+++ b/rp/utils/print_roa
@@ -24,14 +24,14 @@ signature.
 import argparse
 import rpki.POW
 
-class ROA(rpki.POW.ROA):
+class ROA(rpki.POW.ROA):                # pylint: disable=W0232
 
   @staticmethod
-  def _format_prefix(prefix):
-    if prefix[2] is None or prefix[1] == prefix[2]:
-      return "%s/%d" % (prefix[0], prefix[1])
+  def _format_prefix(p):
+    if p[2] in (None, p[1]):
+      return "%s/%d" % (p[0], p[1])
     else:
-      return "%s/%d-%d" % (prefix[0], prefix[1], prefix[2])
+      return "%s/%d-%d" % (p[0], p[1], p[2])
 
   def parse(self):
     self.extractWithoutVerifying()
@@ -58,12 +58,12 @@ for roa in args.roas:
     print "asID:          ", roa.getASID()
     if roa.v4_prefixes:
       print " addressFamily:", 1
-      for p in roa.v4_prefixes:
-        print "     IPAddress:", p
+      for prefix in roa.v4_prefixes:
+        print "     IPAddress:", prefix
     if roa.v6_prefixes:
       print " addressFamily:", 2
-      for p in roa.v6_prefixes:
-        print "     IPAddress:", p
+      for prefix in roa.v6_prefixes:
+        print "     IPAddress:", prefix
     if args.cms:
       print roa.pprint()
       for cer in roa.certs():
diff --git a/rp/utils/print_rpki_manifest b/rp/utils/print_rpki_manifest
index 5ebc6356..ce9b25ea 100755
--- a/rp/utils/print_rpki_manifest
+++ b/rp/utils/print_rpki_manifest
@@ -39,8 +39,8 @@ for mft in args.manifests:
   print "nextUpdate:      ", mft.getNextUpdate()
   print "fileHashAlg:     ", rpki.oids.oid2name(mft.getAlgorithm())
   for i, fah in enumerate(mft.getFiles()):
-    name, hash = fah
-    print "fileList[%3d]:    %s %s" % (i, ":".join(("%02X" % ord(h) for h in hash)), name)
+    name, obj_hash = fah
+    print "fileList[%3d]:    %s %s" % (i, ":".join(("%02X" % ord(h) for h in obj_hash)), name)
   if args.cms:
     print mft.pprint()
     for cer in mft.certs():
diff --git a/rp/utils/scan_roas b/rp/utils/scan_roas
index a1b64f01..4f3dc7f0 100755
--- a/rp/utils/scan_roas
+++ b/rp/utils/scan_roas
@@ -31,10 +31,10 @@ def check_dir(d):
     raise argparse.ArgumentTypeError("%r is not a directory" % d)
   return d
 
-class ROA(rpki.POW.ROA):
+class ROA(rpki.POW.ROA):                # pylint: disable=W0232
 
   @classmethod
-  def parse(cls, fn):
+  def parse(cls, fn):                   # pylint: disable=W0621
     self = cls.derReadFile(fn)
     self.extractWithoutVerifying()
     return self