Avoid OverflowError with large ranges

bd808 · bd808 · commit 4766cb7c2e37 · 2014-03-01T10:17:12.000-07:00
Use `IpRange.__len__()` directly rather than calling `len(IpRange())` when computing the length of an IpRangeList. This won't stop OverflowErrors in calling code such as `len(IpRangeList('fe80::/10'))`, but it will provide a method to work around the overflow by direct use of `IpRangeList.__len__()`. Issue: #12
diff --git a/iptools/__init__.py b/iptools/__init__.py
@@ -219,6 +219,8 @@ def __len__(self):
         2
         >>> len(IpRange('127/22'))
         1024
+        >>> IpRange('fe80::/10').__len__()
+        332306998946228968225951765070086144L
         """
         return self._len
     #end __len__
@@ -510,8 +512,10 @@ def __len__(self):
         256
         >>> len(IpRangeList('192.168.0.0/22'))
         1024
+        >>> IpRangeList('fe80::/10').__len__()
+        332306998946228968225951765070086144L
         """
-        return sum([len(r) for r in self.ips])
+        return sum(r.__len__() for r in self.ips)
     #end __len__
 #end class IpRangeList
 

Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,8 @@ def __len__(self):`
`219`	`219`	`2`
`220`	`220`	`>>> len(IpRange('127/22'))`
`221`	`221`	`1024`
	`222`	`+ >>> IpRange('fe80::/10').__len__()`
	`223`	`+ 332306998946228968225951765070086144L`
`222`	`224`	`"""`
`223`	`225`	`return self._len`
`224`	`226`	`#end __len__`
`@@ -510,8 +512,10 @@ def __len__(self):`
`510`	`512`	`256`
`511`	`513`	`>>> len(IpRangeList('192.168.0.0/22'))`
`512`	`514`	`1024`
	`515`	`+ >>> IpRangeList('fe80::/10').__len__()`
	`516`	`+ 332306998946228968225951765070086144L`
`513`	`517`	`"""`
`514`		`- return sum([len(r) for r in self.ips])`
	`518`	`+ return sum(r.__len__() for r in self.ips)`
`515`	`519`	`#end __len__`
`516`	`520`	`#end class IpRangeList`
`517`	`521`