From c7c46cd247ce4af34ad0de7a6586a2c858d800b9 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 11 Sep 2009 18:04:51 +0000 Subject: Cleanup svn path=/rpkid/irdbd.py; revision=2749 --- rpkid/irdbd.py | 4 ++-- rpkid/rpki/resource_set.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'rpkid') diff --git a/rpkid/irdbd.py b/rpkid/irdbd.py index 9113f44f..459758df 100755 --- a/rpkid/irdbd.py +++ b/rpkid/irdbd.py @@ -118,13 +118,13 @@ def handler(query, path, cb): q_msg = rpki.left_right.cms_msg.unwrap(query, (bpki_ta, rpkid_cert)) if not isinstance(q_msg, rpki.left_right.msg) or not q_msg.is_query(): - raise rpki.exceptions.BadQuery, "Unexpected %s PDU" % repr(q_msg) + raise rpki.exceptions.BadQuery, "Unexpected %r PDU" % q_msg for q_pdu in q_msg: try: if type(q_pdu) not in handle_dispatch: - raise rpki.exceptions.BadQuery, "Unexpected %s PDU" % repr(q_pdu) + raise rpki.exceptions.BadQuery, "Unexpected %r PDU" % q_pdu handle_dispatch[type(q_pdu)](q_pdu, r_msg) except (rpki.async.ExitNow, SystemExit): diff --git a/rpkid/rpki/resource_set.py b/rpkid/rpki/resource_set.py index 632d175e..ce6be33d 100644 --- a/rpkid/rpki/resource_set.py +++ b/rpkid/rpki/resource_set.py @@ -262,7 +262,7 @@ class resource_set(list): sets. """ assert not self.inherit - assert type(self) is type(other), "Type mismatch %s %s" % (repr(type(self)), repr(type(other))) + assert type(self) is type(other), "Type mismatch %r %r" % (type(self), type(other)) set1 = self[:] set2 = other[:] only1, only2, both = [], [], [] @@ -290,7 +290,7 @@ class resource_set(list): Set union for resource sets. """ assert not self.inherit - assert type(self) is type(other), "Type mismatch: %s %s" % (repr(type(self)), repr(type(other))) + assert type(self) is type(other), "Type mismatch: %r %r" % (type(self), type(other)) set1 = self[:] set2 = other[:] result = [] -- cgit v1.2.3