diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/ipaddress.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_ipaddress.py | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py index 53423e2ad0..79361920b5 100644 --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py @@ -984,7 +984,7 @@ class _BaseNetwork(_IPAddressBase): @property def is_global(self): - """Test if this address is allocated for private networks. + """Test if this address is allocated for public networks. Returns: A boolean, True if the address is not reserved per @@ -1233,6 +1233,7 @@ class IPv4Address(_BaseV4, _BaseAddress): return self in reserved_network @property + @functools.lru_cache() def is_private(self): """Test if this address is allocated for private networks. @@ -1259,14 +1260,14 @@ class IPv4Address(_BaseV4, _BaseAddress): @property def is_global(self): - """Test if this address is allocated for private networks. + """Test if this address is allocated for public networks. Returns: A boolean, True if the address is not reserved per iana-ipv4-special-registry. """ - return not self.is_private + return self in IPv4Network('100.64.0.0/10') or not self.is_private @property @@ -1856,6 +1857,7 @@ class IPv6Address(_BaseV6, _BaseAddress): return self in sitelocal_network @property + @functools.lru_cache() def is_private(self): """Test if this address is allocated for private networks. diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py index c2a2009ac3..25f190c3dc 100644 --- a/Lib/test/test_ipaddress.py +++ b/Lib/test/test_ipaddress.py @@ -1320,6 +1320,7 @@ class IpaddrUnitTest(unittest.TestCase): '127.42.0.0/16').is_loopback) self.assertEqual(False, ipaddress.ip_network('128.0.0.0').is_loopback) self.assertEqual(True, ipaddress.ip_network('100.64.0.0/10').is_private) + self.assertEqual(False, ipaddress.ip_network('100.64.0.0/10').is_global) self.assertEqual(True, ipaddress.ip_network('192.0.2.128/25').is_private) self.assertEqual(True, |