[Python-checkins] cpython (merge 3.5 -> default): Issue #21386: Merge from 3.5

Sat Jun 11 15:12:33 EDT 2016

https://hg.python.org/cpython/rev/1519ca772e54
changeset: 101880:1519ca772e54
parent: 101878:2a01d7a488e9
parent: 101879:d65191861599
user: Berker Peksag <berker.peksag at gmail.com>
date: Sat Jun 11 22:12:36 2016 +0300
summary:
 Issue #21386: Merge from 3.5
files:
 Lib/ipaddress.py | 7 +++++++
 Lib/test/test_ipaddress.py | 3 +++
 Misc/NEWS | 3 +++
 3 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -1312,6 +1312,11 @@
 return any(self in net for net in self._constants._private_networks)
 
 @property
+ @functools.lru_cache()
+ def is_global(self):
+ return self not in self._constants._public_network and not self.is_private
+
+ @property
 def is_multicast(self):
 """Test if the address is reserved for multicast use.
 
@@ -1557,6 +1562,8 @@
 
 _multicast_network = IPv4Network('224.0.0.0/4')
 
+ _public_network = IPv4Network('100.64.0.0/10')
+
 _private_networks = [
 IPv4Network('0.0.0.0/8'),
 IPv4Network('10.0.0.0/8'),
diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
--- a/Lib/test/test_ipaddress.py
+++ b/Lib/test/test_ipaddress.py
@@ -1626,6 +1626,9 @@
 self.assertEqual(False,
 ipaddress.ip_address('169.255.100.200').is_link_local)
 
+ self.assertTrue(ipaddress.ip_address('192.0.7.1').is_global)
+ self.assertFalse(ipaddress.ip_address('203.0.113.1').is_global)
+
 self.assertEqual(True,
 ipaddress.ip_address('127.100.200.254').is_loopback)
 self.assertEqual(True, ipaddress.ip_address('127.42.0.0').is_loopback)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -38,6 +38,9 @@
 Library
 -------
 
+- Issue #21386: Implement missing IPv4Address.is_global property. It was
+ documented since 07a5610bae9d. Initial patch by Roger Luethi.
+
 - Issue #27029: Removed deprecated support of universal newlines mode from
 ZipFile.open().
 
-- 
Repository URL: https://hg.python.org/cpython
