summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-29 09:05:06 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-05-29 09:05:06 (GMT)
commite501a93c18085a0ae0000a759438dcf3c162ddb6 (patch)
tree6ce860fadb4cd92c8c1df44297b07dde7c41d1d1 /Lib/test
parent2bac3b778f0a3efe374334b9694e99ed48431414 (diff)
parent8d56c026a5dd724318be005465366d5140fa6fe7 (diff)
downloadcpython-e501a93c18085a0ae0000a759438dcf3c162ddb6.zip
cpython-e501a93c18085a0ae0000a759438dcf3c162ddb6.tar.gz
cpython-e501a93c18085a0ae0000a759438dcf3c162ddb6.tar.bz2
Issue #27125: Merge typo fixes from 3.5
Also merge changes from Issue #27117; no actual code changes to 3.6.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_httplib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 7d997b0..329f068 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -255,8 +255,8 @@ class HeaderTests(TestCase):
self.assertIn(b'\xa0NonbreakSpace: value', conn._buffer)
def test_ipv6host_header(self):
- # Default host header on IPv6 transaction should wrapped by [] if
- # its actual IPv6 address
+ # Default host header on IPv6 transaction should be wrapped by [] if
+ # it is an IPv6 address
expected = b'GET /foo HTTP/1.1\r\nHost: [2001::]:81\r\n' \
b'Accept-Encoding: identity\r\n\r\n'
conn = client.HTTPConnection('[2001::]:81')