summaryrefslogtreecommitdiff
path: root/Lib/ipaddress.py
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2012-06-01 20:12:17 +0200
committerHynek Schlawack <hs@ox.cx>2012-06-01 20:12:17 +0200
commit35db513187a6150978f6a7355d3bd42f1a8b54e5 (patch)
tree42ba69527f8e7b44fde9e0d8ab4f02b3f48b283f /Lib/ipaddress.py
parentd1ab6089ff2b4f1277676a5feac11d311b2c52ab (diff)
downloadcpython-git-35db513187a6150978f6a7355d3bd42f1a8b54e5.tar.gz
#14814: Fix errror message creation in ipaddress.collapse_addresses
Diffstat (limited to 'Lib/ipaddress.py')
-rw-r--r--Lib/ipaddress.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index 7df9f20f3e..6763517cc1 100644
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -359,7 +359,7 @@ def collapse_addresses(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