More lint

svn path=/rpkid/Makefile; revision=2373

7 files changed, 12 insertions, 12 deletions

diff --git a/rpkid/rpki/config.py b/rpkid/rpki/config.py
index df856311..72bbc589 100644
--- a/rpkid/rpki/config.py
+++ b/rpkid/rpki/config.py
@@ -22,11 +22,11 @@ import ConfigParser
 
 class parser(ConfigParser.RawConfigParser):
 
-  def __init__(self, file = None, section = None):
+  def __init__(self, filename = None, section = None):
     """Initialize this parser."""
     ConfigParser.RawConfigParser.__init__(self)
-    if file:
-      self.read(file)
+    if filename:
+      self.read(filename)
     self.default_section = section
 
   def multiget(self, option, section = None):
diff --git a/rpkid/rpki/https.py b/rpkid/rpki/https.py
index 0e51cec9..b461f0cf 100644
--- a/rpkid/rpki/https.py
+++ b/rpkid/rpki/https.py
@@ -216,7 +216,7 @@ class requestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
   def rpki_find_handler(self):
     """Helper method to search self.rpki_handlers."""
-    for s,h in self.rpki_handlers:
+    for s, h in self.rpki_handlers:
       if self.path.startswith(s):
         return h
     return None
@@ -321,5 +321,5 @@ def server(handlers, server_key, server_cert, port = 4433, host ="", client_ta =
   except rpki.exceptions.ServerShuttingDown:
     pass
   finally:
-    for sig,handler in old_signal_handlers:
+    for sig, handler in old_signal_handlers:
       signal.signal(sig, handler)
diff --git a/rpkid/rpki/oids.py b/rpkid/rpki/oids.py
index 5824ad17..59c36cf8 100644
--- a/rpkid/rpki/oids.py
+++ b/rpkid/rpki/oids.py
@@ -54,4 +54,4 @@ oid2name = {
 ## @var name2oid
 # Mapping table of string names to OIDs
 
-name2oid = dict((v,k) for k,v in oid2name.items())
+name2oid = dict((v, k) for k, v in oid2name.items())
diff --git a/rpkid/rpki/resource_set.py b/rpkid/rpki/resource_set.py
index baaccfc4..10736812 100644
--- a/rpkid/rpki/resource_set.py
+++ b/rpkid/rpki/resource_set.py
@@ -307,7 +307,7 @@ class resource_set(list):
     sql.execute(query, args)
     return cls(ini = [cls.range_type(cls.range_type.datum_type(b),
                                      cls.range_type.datum_type(e))
-                      for (b,e) in sql.fetchall()])
+                      for (b, e) in sql.fetchall()])
 
 class resource_set_as(resource_set):
   """ASN resource set."""
@@ -690,7 +690,7 @@ class roa_prefix_set(list):
 
     sql.execute(query, args)
     return cls([cls.prefix_type(cls.prefix_type.range_type.datum_type(x), int(y), int(z))
-                for (x,y,z) in sql.fetchall()])
+                for (x, y, z) in sql.fetchall()])
 
   def to_roa_tuple(self):
     """Convert ROA prefix set into tuple format used by ROA ASN.1 encoder.
diff --git a/rpkid/rpki/sql.py b/rpkid/rpki/sql.py
index 6705e53b..61c1ed8f 100644
--- a/rpkid/rpki/sql.py
+++ b/rpkid/rpki/sql.py
@@ -97,7 +97,7 @@ class template(object):
   """SQL template generator."""
   def __init__(self, table_name, index_column, *data_columns):
     """Build a SQL template."""
-    type_map     = dict((x[0],x[1]) for x in data_columns if isinstance(x, tuple))
+    type_map     = dict((x[0], x[1]) for x in data_columns if isinstance(x, tuple))
     data_columns = tuple(isinstance(x, tuple) and x[0] or x for x in data_columns)
     columns      = (index_column,) + data_columns
     self.table   = table_name
diff --git a/rpkid/rpki/up_down.py b/rpkid/rpki/up_down.py
index 2d087b0d..e5031c00 100644
--- a/rpkid/rpki/up_down.py
+++ b/rpkid/rpki/up_down.py
@@ -476,7 +476,7 @@ class message_pdu(base_elt):
     "revoke_response" : revoke_response_pdu,
     "error_response"  : error_response_pdu }
 
-  type2name = dict((v,k) for k,v in name2type.items())
+  type2name = dict((v, k) for k, v in name2type.items())
 
   def toXML(self):
     """Generate payload of message PDU."""
diff --git a/rpkid/rpki/xml_utils.py b/rpkid/rpki/xml_utils.py
index 2f29b312..566c9a50 100644
--- a/rpkid/rpki/xml_utils.py
+++ b/rpkid/rpki/xml_utils.py
@@ -62,7 +62,7 @@ class sax_handler(xml.sax.handler.ContentHandler):
     that's the object we'll be returning as our final result.
     """
     a = dict()
-    for k,v in attrs.items():
+    for k, v in attrs.items():
       if isinstance(k, tuple):
         if k == ("http://www.w3.org/XML/1998/namespace", "lang"):
           k = "xml:lang"
@@ -168,7 +168,7 @@ class base_elt(object):
   def make_pdu(cls, **kargs):
     """Generic PDU constructor."""
     self = cls()
-    for k,v in kargs.items():
+    for k, v in kargs.items():
       if isinstance(v, bool):
         v = 1 if v else 0
       setattr(self, k, v)