From 1a25fee2670a50d1c8d1946c591f202b01a6a5e5 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sat, 20 Apr 2013 22:49:36 +0000
Subject: Consider updating ROAs and Ghostbusters when CA certificate changes.

svn path=/trunk/; revision=5305
---
 rpkid/rpki/log.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'rpkid/rpki/log.py')

diff --git a/rpkid/rpki/log.py b/rpkid/rpki/log.py
index adc85585..558d3c68 100644
--- a/rpkid/rpki/log.py
+++ b/rpkid/rpki/log.py
@@ -184,20 +184,25 @@ def log_repr(obj, *tokens):
   """
 
   # pylint: disable=W0702
+
   words = ["%s.%s" % (obj.__class__.__module__, obj.__class__.__name__)]
   try:
     words.append("{%s}" % obj.self.self_handle)
   except:
     pass
+
   for token in tokens:
-    if token is not None and token != "":
+    if token is not None:
       try:
-        assert token is not None
-        words.append(str(token))
+        s = str(token)
       except:
+        s = "???"
         debug("Failed to generate repr() string for object of type %r" % type(token))
         traceback()
-        words.append("???")
+      if s:
+        words.append(s)
+
   if show_python_ids:
     words.append(" at %#x" % id(obj))
+
   return "<" + " ".join(words) + ">"
-- 
cgit v1.2.3