#18705: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-08-17 15:53:55 +03:00
commit 9a3777e525
26 changed files with 49 additions and 49 deletions

View file

@ -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