svc/connect.in (Peer.get): Don't apply filter to default value.

Callers don't expect this, and there will be unfortunate behaviour.  For
example, `T.timespec' explodes if handed a literal integer rather than a
string.

diff --git a/svc/connect.in b/svc/connect.in
index 607a6561bd5e0a8d5cb1bc8dad548295dd91bb07..7a9357237c1149822d9d8cb850055952c596119f 100644 (file)
--- a/svc/connect.in
+++ b/svc/connect.in
@@ -296,12 +296,15 @@ class Peer (object):
     a FILTER function is given then apply it to the information from the
     database before returning it.
     """
     a FILTER function is given then apply it to the information from the
     database before returning it.
     """

-    attr = me.__dict__.get(key, default)
-    if attr is _magic:
-      raise T.TripeJobError('malformed-peer', me.name, 'missing-key', key)
-    elif filter is not None:
-      attr = filter(attr)
-    return attr
+    try:
+      attr = me.__dict__[key]
+    except KeyError:
+      if default is _magic:
+        raise T.TripeJobError('malformed-peer', me.name, 'missing-key', key)
+      return default
+    else:
+      if filter is not None: attr = filter(attr)
+      return attr

 
   def has(me, key):
     """
 
   def has(me, key):
     """