diff options
| author | Charles Machalow <csm10495@gmail.com> | 2023-11-05 16:50:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 16:50:31 (GMT) |
| commit | ba8aa1fd3735aa3dd13a36ad8f059a422d25ff37 (patch) | |
| tree | 37338f169a6502ed9ccb371c07d7e4a23e58aaa6 | |
| parent | 24b5cbd3dce3fe37cdc787ccedd1e73a4f8cfc3c (diff) | |
| download | cpython-ba8aa1fd3735aa3dd13a36ad8f059a422d25ff37.zip cpython-ba8aa1fd3735aa3dd13a36ad8f059a422d25ff37.tar.gz cpython-ba8aa1fd3735aa3dd13a36ad8f059a422d25ff37.tar.bz2 | |
gh-109466: Add ipv6_mapped property to IPv4Address (#109467)
Adds the `IPv4Address.ipv6_mapped` property.
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
| -rw-r--r-- | Doc/library/ipaddress.rst | 7 | ||||
| -rw-r--r-- | Doc/whatsnew/3.13.rst | 6 | ||||
| -rw-r--r-- | Lib/ipaddress.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_ipaddress.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2023-09-15-12-30-21.gh-issue-109466.6ah-aw.rst | 1 |
5 files changed, 32 insertions, 0 deletions
diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst index 9c2dff5..1de36b6 100644 --- a/Doc/library/ipaddress.rst +++ b/Doc/library/ipaddress.rst @@ -219,6 +219,13 @@ write code that handles both IP versions correctly. Address objects are ``True`` if the address is reserved for link-local usage. See :RFC:`3927`. + .. attribute:: ipv6_mapped + + :class:`IPv4Address` object representing the IPv4-mapped IPv6 address. See :RFC:`4291`. + + .. versionadded:: 3.13 + + .. _iana-ipv4-special-registry: https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml .. _iana-ipv6-special-registry: https://www.iana.org/assignments/iana-ipv6-special-registry/iana-ipv6-special-registry.xhtml diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst index f2c1441..e12c2a1 100644 --- a/Doc/whatsnew/3.13.rst +++ b/Doc/whatsnew/3.13.rst @@ -185,6 +185,12 @@ and only logged in :ref:`Python Development Mode <devmode>` or on :ref:`Python built on debug mode <debug-build>`. (Contributed by Victor Stinner in :gh:`62948`.) +ipaddress +--------- + +* Add the :attr:`ipaddress.IPv4Address.ipv6_mapped` property, which returns the IPv4-mapped IPv6 address. + (Contributed by Charles Machalow in :gh:`109466`.) + opcode ------ diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py index 68ddfbe..e398cc1 100644 --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py @@ -1389,6 +1389,16 @@ class IPv4Address(_BaseV4, _BaseAddress): """ return self in self._constants._linklocal_network + @property + def ipv6_mapped(self): + """Return the IPv4-mapped IPv6 address. + + Returns: + The IPv4-mapped IPv6 address per RFC 4291. + + """ + return IPv6Address(f'::ffff:{self}') + class IPv4Interface(IPv4Address): diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py index 33a0f98..b4952ac 100644 --- a/Lib/test/test_ipaddress.py +++ b/Lib/test/test_ipaddress.py @@ -303,6 +303,14 @@ class AddressTestCase_v4(BaseTestCase, CommonTestMixin_v4): def test_weakref(self): weakref.ref(self.factory('192.0.2.1')) + def test_ipv6_mapped(self): + self.assertEqual(ipaddress.IPv4Address('192.168.1.1').ipv6_mapped, + ipaddress.IPv6Address('::ffff:192.168.1.1')) + self.assertEqual(ipaddress.IPv4Address('192.168.1.1').ipv6_mapped, + ipaddress.IPv6Address('::ffff:c0a8:101')) + self.assertEqual(ipaddress.IPv4Address('192.168.1.1').ipv6_mapped.ipv4_mapped, + ipaddress.IPv4Address('192.168.1.1')) + class AddressTestCase_v6(BaseTestCase, CommonTestMixin_v6): factory = ipaddress.IPv6Address diff --git a/Misc/NEWS.d/next/Library/2023-09-15-12-30-21.gh-issue-109466.6ah-aw.rst b/Misc/NEWS.d/next/Library/2023-09-15-12-30-21.gh-issue-109466.6ah-aw.rst new file mode 100644 index 0000000..e8e5be3 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-09-15-12-30-21.gh-issue-109466.6ah-aw.rst @@ -0,0 +1 @@ +Add the :attr:`ipaddress.IPv4Address.ipv6_mapped` property, which retuns the IPv4-mapped IPv6 address.
|