summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-06-11 22:11:47 +0300
committerBerker Peksag <berker.peksag@gmail.com>2016-06-11 22:11:47 +0300
commitac5d8be117a85e713f32f90158876dae4c2c6992 (patch)
treeb573f4b0a8bf1f5a32ed4819ebd5b4c833e09ea7
parent54cb82bd17469410c5eb5f5e723063aa2e2b87d8 (diff)
downloadcpython-ac5d8be117a85e713f32f90158876dae4c2c6992.tar.gz
Issue #21386: Implement missing IPv4Address.is_global property
It was documented since 07a5610bae9d. Initial patch by Roger Luethi.
-rw-r--r--Lib/ipaddress.py7
-rw-r--r--Lib/test/test_ipaddress.py3
-rw-r--r--Misc/NEWS3
3 files changed, 13 insertions, 0 deletions
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index ca3031abb4..1f90058382 100644
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -1312,6 +1312,11 @@ class IPv4Address(_BaseV4, _BaseAddress):
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 @@ class _IPv4Constants:
_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
index 3edea08de4..be62fadf0d 100644
--- a/Lib/test/test_ipaddress.py
+++ b/Lib/test/test_ipaddress.py
@@ -1626,6 +1626,9 @@ class IpaddrUnitTest(unittest.TestCase):
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
index f59ed1ec8c..cc5ba7de83 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -139,6 +139,9 @@ Core and Builtins
Library
-------
+- Issue #21386: Implement missing IPv4Address.is_global property. It was
+ documented since 07a5610bae9d. Initial patch by Roger Luethi.
+
- Issue #20900: distutils register command now decodes HTTP responses
correctly. Initial patch by ingrid.