summaryrefslogtreecommitdiffstats
path: root/Lib/http
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-01-13 14:20:31 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-01-13 14:20:31 (GMT)
commit610bc6a211be33b390a9910943f1f9fb7656f634 (patch)
tree9498dd48c73ea91305805a6e1967f32becd39d70 /Lib/http
parent458fc6f98ca9a838af5dcdff64fd48ae3eb64fa9 (diff)
parent82f34ada45f96c13eb68927d6beccdcbab2c77b3 (diff)
downloadcpython-610bc6a211be33b390a9910943f1f9fb7656f634.zip
cpython-610bc6a211be33b390a9910943f1f9fb7656f634.tar.gz
cpython-610bc6a211be33b390a9910943f1f9fb7656f634.tar.bz2
merge 3.4 (#23221)
Diffstat (limited to 'Lib/http')
-rw-r--r--Lib/http/cookiejar.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
index 4135ebf..22f2833 100644
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -1792,7 +1792,7 @@ class FileCookieJar(CookieJar):
def lwp_cookie_str(cookie):
- """Return string representation of Cookie in an the LWP cookie file format.
+ """Return string representation of Cookie in the LWP cookie file format.
Actually, the format is extended a bit -- see module docstring.