summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpmoody@google.com <pmoody@google.com@09200d28-7f98-11dd-ad27-0f66e57d2035>2010-02-02 05:48:18 +0000
committerpmoody@google.com <pmoody@google.com@09200d28-7f98-11dd-ad27-0f66e57d2035>2010-02-02 05:48:18 +0000
commit4e6b0ade83c1919abd7334cd9aee4f427d79cdc2 (patch)
tree858bc6c962a2475d476c6e57b6b5cc4a315c6800
parent0a0e461c9291e3f563a58af23d2e19a9e3d82d89 (diff)
downloadipaddr-py-4e6b0ade83c1919abd7334cd9aee4f427d79cdc2.tar.gz
+ fix for issue51; an errant reference to a non-existant variable.
(thanks to Harry Bock) git-svn-id: https://ipaddr-py.googlecode.com/svn@131 09200d28-7f98-11dd-ad27-0f66e57d2035
-rw-r--r--trunk/ipaddr.py2
-rwxr-xr-xtrunk/ipaddr_test.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/trunk/ipaddr.py b/trunk/ipaddr.py
index b248992..dc70592 100644
--- a/trunk/ipaddr.py
+++ b/trunk/ipaddr.py
@@ -1770,7 +1770,7 @@ class IPv6Network(_BaseV6, _BaseNet):
addr = str(address).split('/')
if len(addr) > 2:
- raise AddressValueError(ipaddr)
+ raise AddressValueError(address)
if not self._is_valid_ip(addr[0]):
raise AddressValueError(addr[0])
diff --git a/trunk/ipaddr_test.py b/trunk/ipaddr_test.py
index ec46da8..9f310fb 100755
--- a/trunk/ipaddr_test.py
+++ b/trunk/ipaddr_test.py
@@ -78,6 +78,8 @@ class IpaddrUnitTest(unittest.TestCase):
self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network,
'1.2.3.4')
self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network,
+ 'cafe:cafe::/128/190')
+ self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network,
'1234:axy::b')
self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Address,
'1234:axy::b')