@@ -391,14 +391,16 @@ def assertBadSplit(addr):
391391
392392 def test_bad_address_split_v6_too_long (self ):
393393 def assertBadSplit (addr ):
394- msg = r"At most 39 characters expected in %s"
395- with self .assertAddressError (msg , repr ( re .escape (addr [:14 ]) )):
394+ msg = r"At most 45 characters expected in ' %s"
395+ with self .assertAddressError (msg , re .escape (addr [:45 ] )):
396396 ipaddress .IPv6Address (addr )
397397
398398 # Long IPv6 address
399399 long_addr = ("0:" * 10000 ) + "0"
400400 assertBadSplit (long_addr )
401401 assertBadSplit (long_addr + "%zoneid" )
402+ assertBadSplit (long_addr + ":255.255.255.255" )
403+ assertBadSplit (long_addr + ":ffff:255.255.255.255" )
402404
403405 def test_bad_address_split_v6_too_many_parts (self ):
404406 def assertBadSplit (addr ):
@@ -2170,6 +2172,11 @@ def testIPv6AddressTooLarge(self):
21702172 self .assertEqual (ipaddress .ip_address ('FFFF::192.0.2.1' ),
21712173 ipaddress .ip_address ('FFFF::c000:201' ))
21722174
2175+ self .assertEqual (ipaddress .ip_address ('0000:0000:0000:0000:0000:FFFF:192.168.255.255' ),
2176+ ipaddress .ip_address ('::ffff:c0a8:ffff' ))
2177+ self .assertEqual (ipaddress .ip_address ('FFFF:0000:0000:0000:0000:0000:192.168.255.255' ),
2178+ ipaddress .ip_address ('ffff::c0a8:ffff' ))
2179+
21732180 self .assertEqual (ipaddress .ip_address ('::FFFF:192.0.2.1%scope' ),
21742181 ipaddress .ip_address ('::FFFF:c000:201%scope' ))
21752182 self .assertEqual (ipaddress .ip_address ('FFFF::192.0.2.1%scope' ),
@@ -2182,6 +2189,10 @@ def testIPv6AddressTooLarge(self):
21822189 ipaddress .ip_address ('::FFFF:c000:201%scope' ))
21832190 self .assertNotEqual (ipaddress .ip_address ('FFFF::192.0.2.1' ),
21842191 ipaddress .ip_address ('FFFF::c000:201%scope' ))
2192+ self .assertEqual (ipaddress .ip_address ('0000:0000:0000:0000:0000:FFFF:192.168.255.255%scope' ),
2193+ ipaddress .ip_address ('::ffff:c0a8:ffff%scope' ))
2194+ self .assertEqual (ipaddress .ip_address ('FFFF:0000:0000:0000:0000:0000:192.168.255.255%scope' ),
2195+ ipaddress .ip_address ('ffff::c0a8:ffff%scope' ))
21852196
21862197 def testIPVersion (self ):
21872198 self .assertEqual (self .ipv4_address .version , 4 )
@@ -2585,6 +2596,10 @@ def testCompressIPv6Address(self):
25852596 '::7:6:5:4:3:2:0' : '0:7:6:5:4:3:2:0/128' ,
25862597 '7:6:5:4:3:2:1::' : '7:6:5:4:3:2:1:0/128' ,
25872598 '0:6:5:4:3:2:1::' : '0:6:5:4:3:2:1:0/128' ,
2599+ '0000:0000:0000:0000:0000:0000:255.255.255.255' : '::ffff:ffff/128' ,
2600+ '0000:0000:0000:0000:0000:ffff:255.255.255.255' : '::ffff:255.255.255.255/128' ,
2601+ 'ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255' :
2602+ 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128' ,
25882603 }
25892604 for uncompressed , compressed in list (test_addresses .items ()):
25902605 self .assertEqual (compressed , str (ipaddress .IPv6Interface (
0 commit comments