summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorEli Bendersky <eliben@gmail.com>2012-10-07 14:24:24 (GMT)
committerEli Bendersky <eliben@gmail.com>2012-10-07 14:24:24 (GMT)
commitce3b2758cc5f13add141a2a732e4417a0e5ebc16 (patch)
tree2e3c35aa9b75f6ba09919d450c482b3e5822194f /Lib
parent4865376c4457ffc2f76a34bcc29b620c1ea0bcea (diff)
parent948af23a77c41bfa77da89aa138d8a4f4111df99 (diff)
downloadcpython-ce3b2758cc5f13add141a2a732e4417a0e5ebc16.zip
cpython-ce3b2758cc5f13add141a2a732e4417a0e5ebc16.tar.gz
cpython-ce3b2758cc5f13add141a2a732e4417a0e5ebc16.tar.bz2
merge 3.3
Diffstat (limited to 'Lib')
-rw-r--r--Lib/ipaddress.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index 22efb09..532e44e 100644
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -206,10 +206,11 @@ def summarize_address_range(first, last):
"""Summarize a network range given the first and last IP addresses.
Example:
- >>> summarize_address_range(IPv4Address('192.0.2.0'),
- IPv4Address('192.0.2.130'))
+ >>> list(summarize_address_range(IPv4Address('192.0.2.0'),
+ ... IPv4Address('192.0.2.130')))
+ ... #doctest: +NORMALIZE_WHITESPACE
[IPv4Network('192.0.2.0/25'), IPv4Network('192.0.2.128/31'),
- IPv4Network('192.0.2.130/32')]
+ IPv4Network('192.0.2.130/32')]
Args:
first: the first IPv4Address or IPv6Address in the range.