summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Moss <david.moss@singletrack.com>2016-09-16 23:23:33 +0100
committerDavid Moss <david.moss@singletrack.com>2016-09-16 23:23:33 +0100
commit212953fdc25cbdcbe36100b2de778b004d6d9b54 (patch)
treea8489d034d6a6dd1f5c55db801b9ea413f0fc3a6
parent94a35e4e2420e7c1cd7879104a03ff03a786036b (diff)
parent59027ce93baf9558612b40f55b455725e76deae5 (diff)
downloadnetaddr-212953fdc25cbdcbe36100b2de778b004d6d9b54.tar.gz
Merge branch 'braaen-rel-0.7.x' into rel-0.7.x
-rw-r--r--netaddr/ip/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/netaddr/ip/__init__.py b/netaddr/ip/__init__.py
index 52b90fa..ff716e5 100644
--- a/netaddr/ip/__init__.py
+++ b/netaddr/ip/__init__.py
@@ -1277,11 +1277,12 @@ class IPNetwork(BaseIP, IPListMixin):
def iter_hosts(self):
"""
- An generator that provides all the IP addresses that can be assigned
+ A generator that provides all the IP addresses that can be assigned
to hosts within the range of this IP object's subnet.
- for IPv4, the network and broadcast addresses are always excluded. \
- Any subnet that contains less than 4 IP addresses yields an empty list.
+ for subnets that contains less than 4 IP addresses /31 and /32 \
+ report in a manner per RFC 3021
- for IPv6, only the unspecified address '::' or Subnet-Router anycast \
address (first address in the network) is excluded.