summaryrefslogtreecommitdiff
path: root/Lib/http
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-14 01:29:13 +0000
committerMartin Panter <vadmium+py@gmail.com>2015-11-14 01:29:13 +0000
commit4d7f4dbe6937cd344ac07f12d376f13e7b3f75ed (patch)
treeb4e8a126b85940808eb0e80ca6d525c99e878456 /Lib/http
parent04d70b51387edb7b650b3542d818e52f2851a690 (diff)
parent0ecc7ec81624ab55f1c2afdb55ccfdcf5d6b0372 (diff)
downloadcpython-4d7f4dbe6937cd344ac07f12d376f13e7b3f75ed.tar.gz
Merge typo and grammar fixes from 3.5
Diffstat (limited to 'Lib/http')
-rw-r--r--Lib/http/cookiejar.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
index e215398793..ac5e667dba 100644
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -423,10 +423,10 @@ def join_header_words(lists):
Takes a list of lists of (key, value) pairs and produces a single header
value. Attribute values are quoted if needed.
- >>> join_header_words([[("text/plain", None), ("charset", "iso-8859/1")]])
- 'text/plain; charset="iso-8859/1"'
- >>> join_header_words([[("text/plain", None)], [("charset", "iso-8859/1")]])
- 'text/plain, charset="iso-8859/1"'
+ >>> join_header_words([[("text/plain", None), ("charset", "iso-8859-1")]])
+ 'text/plain; charset="iso-8859-1"'
+ >>> join_header_words([[("text/plain", None)], [("charset", "iso-8859-1")]])
+ 'text/plain, charset="iso-8859-1"'
"""
headers = []