checkpoint

[python-rwhoisd.git] / rwhoisd / Cidr.py

diff --git a/rwhoisd/Cidr.py b/rwhoisd/Cidr.py
index fb86a10..e98d8bd 100644 (file)
--- a/rwhoisd/Cidr.py
+++ b/rwhoisd/Cidr.py
@@ -47,7 +47,7 @@ def valid_cidr(address):
     try:
         c = new(address)
         return c
-    except (ValueError, socket.error):
+    except socket.error:
         return False
 
 
@@ -65,7 +65,7 @@ class Cidr:
             return
 
         if not self.is_valid_cidr(address):
-            raise ValueError, \
+            raise socket.error, \
                 repr(address) + " is not a valid CIDR representation"
 
         if netlen < 0:
@@ -99,7 +99,7 @@ class Cidr:
         address is numerically less or if the block is larger.  That
         is, supernets will sort before subnets.  This ordering allows
         for an efficient search for subnets of a given network."""
-
+        if not isinstance(other, Cidr): return -1
         res = self._base_mask(self.numaddr) - other._base_mask(other.numaddr)
         if res == 0: res = self.netlen - other.netlen
         if res < 0: return -1
@@ -236,7 +236,6 @@ class CidrV6(Cidr):
             self._convert_ipstr(address)
             return True
         except socket.error, e:
-            print "Failed to convert address string '%s': " + str(e) % (address)
             return False
 
     def _base_mask(self, numaddr):