bpo-44012: IPv6Address.exploded with scope_id

Support for scoped IPv6 addresses was implemented in bpo-34788
but missed implementing the .exploded method:

>>> import ipaddress
>>> ipaddress.IPv6Address('fe80::1%eth0').exploded
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/usr/lib/python3.9/ipaddress.py", line 394, in exploded
    return self._explode_shorthand_ip_string()
  File "/usr/lib/python3.9/ipaddress.py", line 1824, in _explode_shorthand_ip_string
    ip_int = self._ip_int_from_string(ip_str)
  File "/usr/lib/python3.9/ipaddress.py", line 1705, in _ip_int_from_string
    raise AddressValueError("%s in %r" % (exc, ip_str)) from None
ipaddress.AddressValueError: Only hex digits permitted in '1%eth0' in 'fe80::1%eth0'

After this commit:

>>> import ipaddress
>>> ipaddress.IPv6Address('fe80::1%eth0').exploded
'fe80:0000:0000:0000:0000:0000:0000:0001%eth0'

Author: ohwgiles

Lib/ipaddress.py

@@ -1812,9 +1812,6 @@ def _string_from_ip_int(cls, ip_int=None):
     def _explode_shorthand_ip_string(self):
         """Expand a shortened IPv6 address.
 
-        Args:
-            ip_str: A string, the IPv6 address.
-
         Returns:
             A string, the expanded IPv6 address.
 
@@ -1824,14 +1821,14 @@ def _explode_shorthand_ip_string(self):
         elif isinstance(self, IPv6Interface):
             ip_str = str(self.ip)
         else:
-            ip_str = str(self)
+            ip_str = str(self._string_from_ip_int(self._ip))
 
         ip_int = self._ip_int_from_string(ip_str)
         hex_str = '%032x' % ip_int
-        parts = [hex_str[x:x+4] for x in range(0, 32, 4)]
+        exploded = ':'.join([hex_str[x:x+4] for x in range(0, 32, 4)])
         if isinstance(self, (_BaseNetwork, IPv6Interface)):
-            return '%s/%d' % (':'.join(parts), self._prefixlen)
-        return ':'.join(parts)
+            return '%s/%d' % (exploded, self._prefixlen)
+        return exploded + '%' + self._scope_id if self._scope_id else exploded
 
     def _reverse_pointer(self):
         """Return the reverse DNS pointer name for the IPv6 address.

Lib/test/test_ipaddress.py

@@ -2454,6 +2454,8 @@ def testExplodeShortHandIpStr(self):
                          addr1.exploded)
         self.assertEqual('0000:0000:0000:0000:0000:0000:0000:0001/128',
                          ipaddress.IPv6Interface('::1/128').exploded)
+        self.assertEqual('fe80:0000:0000:0000:0000:0000:0000:0001%1',
+                         ipaddress.IPv6Address('fe80::1%1').exploded)
         # issue 77
         self.assertEqual('2001:0000:5ef5:79fd:0000:059d:a0e5:0ba1',
                          addr2.exploded)

Misc/NEWS.d/next/Library/2021-06-03-22-23-38.bpo-44012.BK3HfA.rst

@@ -0,0 +1 @@
+:meth:`ipaddress.IPv6Address.exploded` now supports IPv6 addresses with a ``scope_id`` (link-local addresses)