summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Moody <pmoody@google.com>2012-06-11 09:39:35 -0700
committerPeter Moody <pmoody@google.com>2012-06-11 09:39:35 -0700
commitba2b1c98eaa0e158962f7c5647d94ec00a7d5b1c (patch)
treeea60c01919480fa5048bfe79bb44d94c6a97f762
parent728996d6b1d45e202e0fc79d52f59992dcaebec5 (diff)
downloadipaddr-py-ba2b1c98eaa0e158962f7c5647d94ec00a7d5b1c.tar.gz
fix for issue:95, refer to nets in the exception
-rw-r--r--trunk/ipaddr.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/trunk/ipaddr.py b/trunk/ipaddr.py
index 5943635..d1b0348 100644
--- a/trunk/ipaddr.py
+++ b/trunk/ipaddr.py
@@ -350,7 +350,7 @@ def collapse_address_list(addresses):
else:
if nets and nets[-1]._version != ip._version:
raise TypeError("%s and %s are not of the same version" % (
- str(ip), str(ips[-1])))
+ str(ip), str(nets[-1])))
nets.append(ip)
# sort and dedup