diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-17 15:53:55 +0300 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-17 15:53:55 +0300 |
| commit | 9a3777e525b389ec5881c3f80a482fb821ab3ea5 (patch) | |
| tree | e83520348eea751f2b02e8effa76f3cce2c644cd /Lib/poplib.py | |
| parent | 07351a044960f259c8730de3f81356fbcdbe2bbf (diff) | |
| parent | 30b9d5d3af043fc2687ad11a188a34fe355e20ef (diff) | |
| download | cpython-git-9a3777e525b389ec5881c3f80a482fb821ab3ea5.tar.gz | |
#18705: merge with 3.3.
Diffstat (limited to 'Lib/poplib.py')
| -rw-r--r-- | Lib/poplib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/poplib.py b/Lib/poplib.py index 0f12ae2f2e..be98a7dbeb 100644 --- a/Lib/poplib.py +++ b/Lib/poplib.py @@ -345,7 +345,7 @@ class POP3: >>> Really, according to RFC 2449, the cyrus folks should avoid - having the implementation splitted into multiple arguments... + having the implementation split into multiple arguments... """ def _parsecap(line): lst = line.decode('ascii').split() @@ -395,7 +395,7 @@ if HAVE_SSL: hostname - the hostname of the pop3 over ssl server port - port number - keyfile - PEM formatted file that countains your private key + keyfile - PEM formatted file that contains your private key certfile - PEM formatted certificate chain file context - a ssl.SSLContext |