summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-06-11 19:11:47 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-06-11 19:11:47 (GMT)
commit742192a4fea88b49633288fb6e5bea68cf0bdcc0 (patch)
tree4f2dfeb88d76e4326d8d97ca712fdfefad23db44 /Lib
parentfa089b9b0b926c04e5d57812b7d7653472787965 (diff)
downloadcpython-742192a4fea88b49633288fb6e5bea68cf0bdcc0.zip
cpython-742192a4fea88b49633288fb6e5bea68cf0bdcc0.tar.gz
cpython-742192a4fea88b49633288fb6e5bea68cf0bdcc0.tar.bz2
Issue #21386: Implement missing IPv4Address.is_global property
It was documented since 07a5610bae9d. Initial patch by Roger Luethi.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/ipaddress.py7
-rw-r--r--Lib/test/test_ipaddress.py3
2 files changed, 10 insertions, 0 deletions
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index ca3031a..1f90058 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 3edea08..be62fad 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)