diff options
| author | David Moss <drkjam@gmail.com> | 2013-03-22 07:21:36 +0000 |
|---|---|---|
| committer | David Moss <drkjam@gmail.com> | 2013-03-22 07:21:36 +0000 |
| commit | f64ae19e533ffa5522dcba1fc833975cb2ee88a5 (patch) | |
| tree | 245715b1fafe5b18242ac365de11deeb52407b1e | |
| parent | a6727cc8c4a8fdb6f8b64c8e41d1d26ec6b7eefb (diff) | |
| download | netaddr-baserock/morph.tar.gz | |
Fixed Issue 46 - len(IPSet()) fails on Python 3baserock/morph
| -rw-r--r-- | netaddr/ip/sets.py | 2 | ||||
| -rw-r--r-- | netaddr/tests/2.x/ip/sets.txt | 2 | ||||
| -rw-r--r-- | netaddr/tests/3.x/ip/sets.txt | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/netaddr/ip/sets.py b/netaddr/ip/sets.py index 2536dc4..0da1743 100644 --- a/netaddr/ip/sets.py +++ b/netaddr/ip/sets.py @@ -609,7 +609,7 @@ class IPSet(object): limitation). Use the .size property for subnets of any size. """ size = self.size - if size > _sys.maxint: + if size > _sys_maxint: raise IndexError("range contains greater than %d (maxint) " \ "IP addresses! Use the .size property instead." % _sys_maxint) return size diff --git a/netaddr/tests/2.x/ip/sets.txt b/netaddr/tests/2.x/ip/sets.txt index 5da8cc9..0a7de65 100644 --- a/netaddr/tests/2.x/ip/sets.txt +++ b/netaddr/tests/2.x/ip/sets.txt @@ -16,6 +16,8 @@ An empty set. IPSet([]) >>> IPSet([]) IPSet([]) +>>> len(IPSet([])) +0 You can specify either IP addresses and networks as strings. Alternatively, you can use IPAddress, IPNetwork, IPRange or other IPSet objects. diff --git a/netaddr/tests/3.x/ip/sets.txt b/netaddr/tests/3.x/ip/sets.txt index 2d09d86..2c98b2d 100644 --- a/netaddr/tests/3.x/ip/sets.txt +++ b/netaddr/tests/3.x/ip/sets.txt @@ -18,6 +18,9 @@ IPSet([]) >>> IPSet([]) IPSet([]) +>>> len(IPSet([])) +0 + >>> IPSet(['192.0.2.0']) IPSet(['192.0.2.0/32']) |