diff options
| author | pmoody@google.com <pmoody@google.com@09200d28-7f98-11dd-ad27-0f66e57d2035> | 2011-07-22 17:24:52 +0000 |
|---|---|---|
| committer | pmoody@google.com <pmoody@google.com@09200d28-7f98-11dd-ad27-0f66e57d2035> | 2011-07-22 17:24:52 +0000 |
| commit | 960acf5a4fa4e4fa41f59ac615f2b5974e0211a8 (patch) | |
| tree | 70f726f0a20ed9442e1ed5c7d1d8dfd7a082c19c | |
| parent | 4161d4e4b38ea95805bddc162704b818e9c43985 (diff) | |
| download | ipaddr-py-960acf5a4fa4e4fa41f59ac615f2b5974e0211a8.tar.gz | |
2001:0::3:4:5:6:7:8 should be considered valid
git-svn-id: https://ipaddr-py.googlecode.com/svn@224 09200d28-7f98-11dd-ad27-0f66e57d2035
| -rw-r--r-- | trunk/ipaddr.py | 4 | ||||
| -rwxr-xr-x | trunk/ipaddr_test.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/trunk/ipaddr.py b/trunk/ipaddr.py index a557bbf..63d508b 100644 --- a/trunk/ipaddr.py +++ b/trunk/ipaddr.py @@ -1595,6 +1595,10 @@ class _BaseV6(object): if ip_str.count('.') != 3: return False + # ipaddr should not consider 2001:0::3:4:5:6:7:8 valid + if ip_str.count(':') > 7: + return False + ip_str = self._explode_shorthand_ip_string(ip_str) # Now that we have that all squared away, let's check that each of the diff --git a/trunk/ipaddr_test.py b/trunk/ipaddr_test.py index 64bc2b4..68995a7 100755 --- a/trunk/ipaddr_test.py +++ b/trunk/ipaddr_test.py @@ -893,7 +893,7 @@ class IpaddrUnitTest(unittest.TestCase): '2001:0:0:4:0:0:0:8': '2001:0:0:4::8/128', '2001:0:0:4:5:6:7:8': '2001::4:5:6:7:8/128', '2001:0:3:4:5:6:7:8': '2001:0:3:4:5:6:7:8/128', - '2001:0::3:4:5:6:7:8': '2001:0:3:4:5:6:7:8/128', + '2001:0:3:4:5:6:7:8': '2001:0:3:4:5:6:7:8/128', '0:0:3:0:0:0:0:ffff': '0:0:3::ffff/128', '0:0:0:4:0:0:0:ffff': '::4:0:0:0:ffff/128', '0:0:0:0:5:0:0:ffff': '::5:0:0:ffff/128', |