Issue #27280: Merge from 3.5

This commit is contained in:
Berker Peksag 2016-06-10 14:26:32 +03:00
commit 62e3ad3e03

View file

@ -580,7 +580,7 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
4. A two-tuple of an address description and a netmask, where the address
description is either a string, a 128-bits integer, a 16-bytes packed
integer, or an existing IPv4Address object; and the netmask is an
integer, or an existing IPv6Address object; and the netmask is an
integer representing the prefix length.
An :exc:`AddressValueError` is raised if *address* is not a valid IPv6