changeset:   94208:f7508a176a09
parent:      94206:c79abee84a39
user:        Antoine Pitrou <solipsis@pitrou.net>
date:        Sun Jan 18 16:22:47 2015 +0100
files:       Lib/ipaddress.py Lib/test/test_ipaddress.py Misc/NEWS
description:
Issue #23266: Much faster implementation of ipaddress.collapse_addresses() when there are many non-consecutive addresses.


diff -r c79abee84a39 -r f7508a176a09 Lib/ipaddress.py
--- a/Lib/ipaddress.py	Sun Jan 18 11:33:31 2015 +0200
+++ b/Lib/ipaddress.py	Sun Jan 18 16:22:47 2015 +0100
@@ -170,16 +170,19 @@
         addresses: a list of IPv#Address objects.
 
     Returns:
-        A tuple containing the first and last IP addresses in the sequence.
+        A tuple containing the first and last IP addresses in the sequence,
+        and the number of distinct IP addresses in the sequence.
 
     """
     first = last = addresses[0]
+    i = 1
     for ip in addresses[1:]:
         if ip._ip == last._ip + 1:
             last = ip
+            i += 1
         else:
             break
-    return (first, last)
+    return (first, last, i)
 
 
 def _count_righthand_zero_bits(number, bits):
@@ -346,12 +349,13 @@
                                  ip, nets[-1]))
             nets.append(ip)
 
-    # sort and dedup
-    ips = sorted(set(ips))
-
+    # sort
+    ips = sorted(ips)
+
+    # find consecutive address ranges in the sorted sequence and summarize them
     while i < len(ips):
-        (first, last) = _find_address_range(ips[i:])
-        i = ips.index(last) + 1
+        (first, last, items) = _find_address_range(ips[i:])
+        i = items + i
         addrs.extend(summarize_address_range(first, last))
 
     return _collapse_addresses_internal(addrs + nets)
diff -r c79abee84a39 -r f7508a176a09 Lib/test/test_ipaddress.py
--- a/Lib/test/test_ipaddress.py	Sun Jan 18 11:33:31 2015 +0200
+++ b/Lib/test/test_ipaddress.py	Sun Jan 18 16:22:47 2015 +0100
@@ -766,10 +766,11 @@
                           2 ** ipaddress.IPV6LENGTH)
 
     def testInternals(self):
-        first, last = ipaddress._find_address_range([
+        first, last, nitems = ipaddress._find_address_range([
             ipaddress.IPv4Address('10.10.10.10'),
             ipaddress.IPv4Address('10.10.10.12')])
         self.assertEqual(first, last)
+        self.assertEqual(nitems, 1)
         self.assertEqual(128, ipaddress._count_righthand_zero_bits(0, 128))
         self.assertEqual("IPv4Network('1.2.3.0/24')", repr(self.ipv4_network))
 
diff -r c79abee84a39 -r f7508a176a09 Misc/NEWS
--- a/Misc/NEWS	Sun Jan 18 11:33:31 2015 +0200
+++ b/Misc/NEWS	Sun Jan 18 16:22:47 2015 +0100
@@ -203,6 +203,9 @@
 Library
 -------
 
+- Issue #23266: Much faster implementation of ipaddress.collapse_addresses()
+  when there are many non-consecutive addresses.
+
 - Issue #23098: 64-bit dev_t is now supported in the os module.
 
 - Issue #21817: When an exception is raised in a task submitted to a