summaryrefslogtreecommitdiffstats
path: root/Lib/http
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-14 01:14:25 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-11-14 01:14:25 (GMT)
commit32acc16cdab1e890db17c79a5d32c2379800722d (patch)
tree51d3b4f5afa8351490051816749d198744a533e1 /Lib/http
parentfa9ea046732eff86408aba477d557c8fc92bc864 (diff)
parent2e4571a456c32af964d48b4bf70a9a53d27d10d6 (diff)
downloadcpython-32acc16cdab1e890db17c79a5d32c2379800722d.zip
cpython-32acc16cdab1e890db17c79a5d32c2379800722d.tar.gz
cpython-32acc16cdab1e890db17c79a5d32c2379800722d.tar.bz2
Merge typo and grammar fixes from 3.4 into 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 e215398..ac5e667 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 = []