collapse_address_list is too slow

ipaddr.py

 #!/usr/bin/python
 #
 # Copyright 2007 Google Inc.
 #  Licensed to PSF under a Contributor Agreement.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
@@ skipping 231 matching lines @@
         IPTypeError:
             If the first and last objects are not IP addresses.
             If the first and last objects are not the same version.
         ValueError:
             If the last object is not greater than the first.
             If the version is not 4 or 6.
 
     """
 
     if not (isinstance(first, BaseIP) and isinstance(last, BaseIP)):
-        raise IPTypeError("first and last must be IP addresses not networks.")

[Peter Moody, 2009/08/20 18:21:17]

..." must be IP addresses, not networks"

[Matthew Flanagan, 2009/08/21 00:55:57]

On 2009/08/20 18:21:17, Peter Moody wrote:
> ..." must be IP addresses, not networks"

Done.

+        raise IPTypeError("first and last must be IP addresses, not networks")
     if first.version != last.version:
         raise IPTypeError("IP addresses must be same version")
     if first > last:
         raise ValueError("last IP address must be greater than first")
 
     networks = []
 
     if first.version == 4:
         ip = IPv4Network
     elif first.version == 6:
@@ skipping 83 matching lines @@
 
     """
     i = 0
     addrs = []
     ips = []
     nets = []
     # split IP addresses and networks
     for ip in addresses:
         if isinstance(ip, BaseIP):
             ips.append(ip)
-        elif isinstance(ip, BaseNet):

[Peter Moody, 2009/08/20 18:21:17]

i think you can skip this elif check and just make it an else:

[Matthew Flanagan, 2009/08/21 00:55:57]

On 2009/08/20 18:21:17, Peter Moody wrote:
> i think you can skip this elif check and just make it an else:

Done.

-            if ip._prefixlen == ip._max_prefixlen:
-                ips.append(ip.ip)
-            else:
-                nets.append(ip)
+        elif ip._prefixlen == ip._max_prefixlen:
+            ips.append(ip.ip)
+        else:
+            nets.append(ip)
     # sort and dedup
     ips = sorted(set(ips))
     nets = sorted(set(nets))
         
     while i < len(ips):
         (first, last) = _find_address_range(ips[i:])
         i = ips.index(last) + 1
         addrs.extend(summarize_address_range(first, last))
 
     return _collapse_address_list_recursive(
@@ skipping 1422 matching lines @@
         """
         try:
             prefixlen = int(prefixlen)
         except ValueError:
             return False
         return 0 <= prefixlen <= 128
 
     # backwards compatibility
     Subnet = subnet
     Supernet = supernet