summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authors-sanjay <sanjay537@gmail.com>2017-03-30 07:44:29 (GMT)
committerXiang Zhang <angwerzx@126.com>2017-03-30 07:44:29 (GMT)
commit16f852345bcdec1bbb15e5363fad6b33bf960912 (patch)
tree269f9a723c361351f2355a69a609d158d7a6d6d0
parent84b8e92e463bd6a5174bd3e5a6543580f6319c57 (diff)
downloadcpython-16f852345bcdec1bbb15e5363fad6b33bf960912.zip
cpython-16f852345bcdec1bbb15e5363fad6b33bf960912.tar.gz
cpython-16f852345bcdec1bbb15e5363fad6b33bf960912.tar.bz2
bpo-29913: deprecate compare_networks() in documentation (GH-865)
-rw-r--r--Doc/library/ipaddress.rst3
-rw-r--r--Misc/ACKS1
2 files changed, 4 insertions, 0 deletions
diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 50fb778..90dfd46 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -554,6 +554,9 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
>>> ip_network('192.0.2.1/32').compare_networks(ip_network('192.0.2.1/32'))
0
+ .. deprecated:: 3.7
+ It uses the same ordering and comparison algorithm as "<", "==", and ">"
+
.. class:: IPv6Network(address, strict=True)
diff --git a/Misc/ACKS b/Misc/ACKS
index 2056efe..2164206 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1730,3 +1730,4 @@ Peter Åstrand
evilzero
Dhushyanth Ramasamy
Subhendu Ghosh
+Sanjay Sundaresan