peerdb/tripe-newpeers.in: Count enhancements correctly.

[tripe] / peerdb / tripe-newpeers.in

diff --git a/peerdb/tripe-newpeers.in b/peerdb/tripe-newpeers.in
index 700e69d7826e335b468c5d2236757bf06e9f46e3..c6bf7235c1ee5803f2532d0d2c46237069a90a23 100644 (file)
--- a/peerdb/tripe-newpeers.in
+++ b/peerdb/tripe-newpeers.in
@@ -92,7 +92,7 @@ class BulkResolver (object):
     """
     addr = me._namemap[host]
     if addr is None:
-      raise KeyError, host
+      raise KeyError(host)
     return addr
 
   def _resolved(me, host, addr):
@@ -141,7 +141,7 @@ class MyConfigParser (CP.RawConfigParser):
   """
   A more advanced configuration parser.
 
-  This has two major enhancements over the standard ConfigParser which are
+  This has three major enhancements over the standard ConfigParser which are
   relevant to us.
 
     * It recognizes `@inherits' keys and follows them when expanding a
@@ -236,7 +236,7 @@ class MyConfigParser (CP.RawConfigParser):
       pass
     else:
       if threadp:
-        raise InheritanceCycleError, (key, path)
+        raise InheritanceCycleError(key, path)
 
     ## See whether the answer is ready waiting for us.
     try:
@@ -272,7 +272,7 @@ class MyConfigParser (CP.RawConfigParser):
         value = v
         winner = pp
       elif value != v:
-        raise AmbiguousOptionError, (key, winner, value, pp, v)
+        raise AmbiguousOptionError(key, winner, value, pp, v)
 
     ## That's the best we could manage.
     path.pop()
@@ -291,7 +291,7 @@ class MyConfigParser (CP.RawConfigParser):
     else:
       value, _ = me._get(sec, key)
       if value is None:
-        raise MissingKeyException, (sec, key)
+        raise MissingKeyException(sec, key)
 
     ## Expand the value and return it.
     return me._expand(sec, value, resolvep)