summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Moody <python@hda3.com>2013-10-21 16:16:51 -0700
committerPeter Moody <python@hda3.com>2013-10-21 16:16:51 -0700
commit8ed30c15e8491ba70ee1cc89acec569c72b2ce26 (patch)
treee0ef5fa0db94824088da87d9cfb69e0843931dd8
parent8da15cc2189a97500e83cd50ab761920365fcdf1 (diff)
downloadcpython-git-8ed30c15e8491ba70ee1cc89acec569c72b2ce26.tar.gz
#17400; NEWS and ipaddress.rst change
-rw-r--r--Doc/library/ipaddress.rst7
-rw-r--r--Misc/NEWS2
2 files changed, 7 insertions, 2 deletions
diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 769af72769..7336204d6d 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -158,10 +158,13 @@ write code that handles both IP versions correctly.
``True`` if the address is reserved for multicast use. See
:RFC:`3171` (for IPv4) or :RFC:`2373` (for IPv6).
- .. attribute:: is_private
+ .. attribute:: is_global
``True`` if the address is allocated for private networks. See
- :RFC:`1918` (for IPv4) or :RFC:`4193` (for IPv6).
+ iana-ipv4-special-registry (for IPv4) or iana-ipv6-special-registry
+ (for IPv6).
+
+ .. versionadded:: 3.4
.. attribute:: is_unspecified
diff --git a/Misc/NEWS b/Misc/NEWS
index f60bbd181d..84f6e2c9bb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,8 @@ Core and Builtins
Library
-------
+- Issue #17400: ipaddress should make it easy to identify rfc6598 addresses.
+
- Load SSL's error strings in hashlib.
- Issue #18527: Upgrade internal copy of zlib to 1.2.8.