From d17d7a415372d21d95b8d787a7e11bc16278acfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damien=20Nad=C3=A9?= Date: Wed, 4 Sep 2013 08:53:34 +0200 Subject: [PATCH 1/2] In validate_subnet: str.split second parameter is how many split can be done, not number of items returned --- iptools/ipv4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iptools/ipv4.py b/iptools/ipv4.py index 5696e7d..6280ee9 100644 --- a/iptools/ipv4.py +++ b/iptools/ipv4.py @@ -343,7 +343,7 @@ def validate_subnet(s): """ if isinstance(s, basestring): if '/' in s: - start, mask = s.split('/', 2) + start, mask = s.split('/', 1) return validate_ip(start) and validate_netmask(mask) else: return False From 811c5f68292606a7fa10ffa1f55560c54f6a9e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damien=20Nad=C3=A9?= Date: Wed, 4 Sep 2013 08:59:02 +0200 Subject: [PATCH 2/2] using list comprehension instead of map --- iptools/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iptools/__init__.py b/iptools/__init__.py index 384fed1..414c93f 100644 --- a/iptools/__init__.py +++ b/iptools/__init__.py @@ -407,7 +407,7 @@ class IpRangeList (object): :type \*args: list of str and/or tuple """ def __init__(self, *args): - self.ips = tuple(map(IpRange, args)) + self.ips = tuple([IpRange(arg) for arg in args]) #end __init__ def __repr__(self):