[Python-checkins] cpython (merge 3.5 -> default): Issue #27280: Merge from 3.5
berker.peksag
python-checkins at python.org
Fri Jun 10 07:26:31 EDT 2016
https://hg.python.org/cpython/rev/18f1012e0c56
changeset: 101850:18f1012e0c56
parent: 101848:bfd77c6fc04f
parent: 101849:fcd9f6ffbeaf
user: Berker Peksag <berker.peksag at gmail.com>
date: Fri Jun 10 14:26:32 2016 +0300
summary:
Issue #27280: Merge from 3.5
files:
Doc/library/ipaddress.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -580,7 +580,7 @@
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
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list