summaryrefslogtreecommitdiff
path: root/Lib/test/test_ipaddress.py
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2012-07-07 22:15:22 +1000
committerNick Coghlan <ncoghlan@gmail.com>2012-07-07 22:15:22 +1000
commitb582ecc562b0a4c00e2d9fe39f42d22dd9c7f89e (patch)
tree72bf2ff495e65ebaa48c677a62e70ecebb783810 /Lib/test/test_ipaddress.py
parent01ac8b6ab1474d863f364b6c11eb9fce62324169 (diff)
downloadcpython-git-b582ecc562b0a4c00e2d9fe39f42d22dd9c7f89e.tar.gz
Issue 14814: Explain how to get more error detail in the ipaddress tutorial, and tweak the display for octet errors in IPv4 (noticed the formatting problem when adding to the docs)
Diffstat (limited to 'Lib/test/test_ipaddress.py')
-rw-r--r--Lib/test/test_ipaddress.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
index 61ec0d6e40..2ac37e1c64 100644
--- a/Lib/test/test_ipaddress.py
+++ b/Lib/test/test_ipaddress.py
@@ -126,8 +126,8 @@ class AddressErrors_v4(ErrorReporting):
def test_octet_limit(self):
def assertBadOctet(addr, octet):
- msg = "Octet %d > 255 not permitted in %r"
- with self.assertAddressError(msg, octet, addr):
+ msg = "Octet %d (> 255) not permitted in %r" % (octet, addr)
+ with self.assertAddressError(re.escape(msg)):
ipaddress.IPv4Address(addr)
assertBadOctet("12345.67899.-54321.-98765", 12345)
@@ -310,7 +310,7 @@ class NetmaskErrorsMixin_v4:
assertBadAddress("google.com", "Expected 4 octets")
assertBadAddress("10/8", "Expected 4 octets")
assertBadAddress("::1.2.3.4", "Only decimal digits")
- assertBadAddress("1.2.3.256", "256 > 255")
+ assertBadAddress("1.2.3.256", re.escape("256 (> 255)"))
def test_netmask_errors(self):
def assertBadNetmask(addr, netmask):