diff options
Diffstat (limited to 'Lib/ipaddr.py')
-rw-r--r-- | Lib/ipaddr.py | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/Lib/ipaddr.py b/Lib/ipaddr.py index 96000af..940741c 100644 --- a/Lib/ipaddr.py +++ b/Lib/ipaddr.py @@ -10,7 +10,7 @@ and prefixes. """ -__version__ = '1.1.0' +__version__ = '1.1.1' import struct @@ -206,17 +206,25 @@ class BaseIP(object): def __lt__(self, other): try: - return (self.version < other.version - or self.ip < other.ip - or self.netmask < other.netmask) + if self.version != other.version: + return self.version < other.version + if self.ip != other.ip: + return self.ip < other.ip + if self.netmask != other.netmask: + return self.netmask < other.netmask + return False except AttributeError: return NotImplemented def __gt__(self, other): try: - return (self.version > other.version - or self.ip > other.ip - or self.netmask > other.netmask) + if self.version != other.version: + return self.version > other.version + if self.ip != other.ip: + return self.ip > other.ip + if self.netmask != other.netmask: + return self.netmask > other.netmask + return False except AttributeError: return NotImplemented |