[3.13] gh-124217, ipaddress: Add RFC 9637 reserved IPv6 block 3fff::/20 (GH-124240) (#124282)

miss-islington · y5c4l3 · web-flow · commit a93716f6958f · 2024-10-07T23:45:59.000+02:00
gh-124217, ipaddress: Add RFC 9637 reserved IPv6 block `3fff::/20` (GH-124240) (cherry picked from commit db6eb36) Signed-off-by: y5c4l3 <y5c4l3@proton.me> Co-authored-by: Y5 <124019959+y5c4l3@users.noreply.github.com>
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
@@ -2383,6 +2383,8 @@ class _IPv6Constants:
         IPv6Network('2001:db8::/32'),
         # IANA says N/A, let's consider it not globally reachable to be safe
         IPv6Network('2002::/16'),
+        # RFC 9637: https://www.rfc-editor.org/rfc/rfc9637.html#section-6-2.2
+        IPv6Network('3fff::/20'),
         IPv6Network('fc00::/7'),
         IPv6Network('fe80::/10'),
         ]
diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
@@ -2427,6 +2427,8 @@ def testReservedIpv6(self):
         self.assertTrue(ipaddress.ip_address('2001:30::').is_global)
         self.assertFalse(ipaddress.ip_address('2001:40::').is_global)
         self.assertFalse(ipaddress.ip_address('2002::').is_global)
+        # gh-124217: conform with RFC 9637
+        self.assertFalse(ipaddress.ip_address('3fff::').is_global)
 
         # some generic IETF reserved addresses
         self.assertEqual(True, ipaddress.ip_address('100::').is_reserved)
diff --git a/Misc/NEWS.d/next/Library/2024-09-19-20-15-00.gh-issue-124217.j0KlQB.rst b/Misc/NEWS.d/next/Library/2024-09-19-20-15-00.gh-issue-124217.j0KlQB.rst
@@ -0,0 +1 @@
+Add RFC 9637 reserved IPv6 block ``3fff::/20`` in :mod:`ipaddress` module.

Original file line number	Diff line number	Diff line change
`@@ -2383,6 +2383,8 @@ class _IPv6Constants:`
`2383`	`2383`	`IPv6Network('2001:db8::/32'),`
`2384`	`2384`	`# IANA says N/A, let's consider it not globally reachable to be safe`
`2385`	`2385`	`IPv6Network('2002::/16'),`
	`2386`	`+ # RFC 9637: https://www.rfc-editor.org/rfc/rfc9637.html#section-6-2.2`
	`2387`	`+ IPv6Network('3fff::/20'),`
`2386`	`2388`	`IPv6Network('fc00::/7'),`
`2387`	`2389`	`IPv6Network('fe80::/10'),`
`2388`	`2390`	`]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Add RFC 9637 reserved IPv6 block ``3fff::/20`` in :mod:`ipaddress` module.