aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2009-05-19 23:06:02 +0000
committerRob Austein <sra@hactrn.net>2009-05-19 23:06:02 +0000
commitd0c51c600ccea8db0c34275ac313c8e89912e643 (patch)
treedac8e15f872705d00aef3e8a26605ad4a3f717c6
parent028f796add089ff6013253c4e22a330e8ee4a477 (diff)
Lint
svn path=/rpkid/rpki/https.py; revision=2441
-rw-r--r--rpkid/rpki/https.py2
-rw-r--r--rpkid/rpki/resource_set.py2
-rw-r--r--rpkid/rpki/rpki_engine.py2
-rw-r--r--rpkid/rpki/up_down.py4
-rw-r--r--rpkid/testbed.py1
5 files changed, 10 insertions, 1 deletions
diff --git a/rpkid/rpki/https.py b/rpkid/rpki/https.py
index 838e5b88..f1e4cece 100644
--- a/rpkid/rpki/https.py
+++ b/rpkid/rpki/https.py
@@ -320,7 +320,7 @@ class http_server(http_stream):
print traceback.format_exc()
self.send_error(500, "Unhandled exception %s" % edata)
else:
- self.send_error(*error)
+ self.send_error(code = error[0], reason = error[1])
def send_error(self, code, reason):
self.send_message(code = code, reason = reason)
diff --git a/rpkid/rpki/resource_set.py b/rpkid/rpki/resource_set.py
index 5aeab3bc..6da5f9cc 100644
--- a/rpkid/rpki/resource_set.py
+++ b/rpkid/rpki/resource_set.py
@@ -206,6 +206,7 @@ class resource_set(list):
"""
Initialize a resource_set.
"""
+ list.__init__(self)
if isinstance(ini, (int, long)):
ini = str(ini)
if ini == inherit_token:
@@ -741,6 +742,7 @@ class roa_prefix_set(list):
"""
Initialize a ROA prefix set.
"""
+ list.__init__(self)
if isinstance(ini, str) and len(ini):
self.extend(self.parse_str(s) for s in ini.split(","))
elif isinstance(ini, (list, tuple)):
diff --git a/rpkid/rpki/rpki_engine.py b/rpkid/rpki/rpki_engine.py
index 4272c74b..9f19dfcd 100644
--- a/rpkid/rpki/rpki_engine.py
+++ b/rpkid/rpki/rpki_engine.py
@@ -811,6 +811,7 @@ class child_cert_obj(rpki.sql.sql_persistent):
"""
Initialize a child_cert_obj.
"""
+ rpki.sql.sql_persistent.__init__(self)
self.gctx = gctx
self.child_id = child_id
self.ca_detail_id = ca_detail_id
@@ -963,6 +964,7 @@ class revoked_cert_obj(rpki.sql.sql_persistent):
def __init__(self, gctx = None, serial = None, revoked = None, expires = None, ca_detail_id = None):
"""Initialize a revoked_cert_obj."""
+ rpki.sql.sql_persistent.__init__(self)
self.gctx = gctx
self.serial = serial
self.revoked = revoked
diff --git a/rpkid/rpki/up_down.py b/rpkid/rpki/up_down.py
index 8b93f5a8..de36c5bc 100644
--- a/rpkid/rpki/up_down.py
+++ b/rpkid/rpki/up_down.py
@@ -87,6 +87,7 @@ class multi_uri(list):
"""
Initialize a set of URIs, which includes basic some syntax checking.
"""
+ list.__init__(self)
if isinstance(ini, (list, tuple)):
self[:] = ini
elif isinstance(ini, str):
@@ -151,6 +152,7 @@ class class_elt(base_elt):
def __init__(self):
"""Initialize class_elt."""
+ base_elt.__init__(self)
self.certs = []
def startElement(self, stack, name, attrs):
@@ -267,6 +269,7 @@ class class_response_syntax(base_elt):
def __init__(self):
"""Initialize class_response_syntax."""
+ base_elt.__init__(self)
self.classes = []
def startElement(self, stack, name, attrs):
@@ -500,6 +503,7 @@ class error_response_pdu(base_elt):
"""
Initialize an error_response PDU from an exception object.
"""
+ base_elt.__init__(self)
if exception is not None:
self.status = self.exceptions.get(type(exception), 2001)
self.description = str(exception)
diff --git a/rpkid/testbed.py b/rpkid/testbed.py
index 187c68c6..87f68f77 100644
--- a/rpkid/testbed.py
+++ b/rpkid/testbed.py
@@ -382,6 +382,7 @@ class allocation_db(list):
Initialize database from the (first) YAML document.
"""
+ list.__init__(self)
self.root = allocation(yaml, self)
assert self.root.is_root()
if self.root.crl_interval is None: