mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

More email package related repairs. This fixes smtplib's import and use of

Browse source 
email.base64mime, but test_smtplib still has failures for me.  They are
timeout errors so think they're more related to my current wacky network setup
than bugs remaining in the code related to the email package.

This also r57693 that got clobbered with the sandbox sync, and fixes a couple
of other minor problems that cropped up.  I will kill the sandbox branch next.

The email package now has 11F/11E.
This commit is contained in:
Barry Warsaw 2007-08-30 14:28:55 +00:00
parent 5a23cc5a01
commit 2cc1f6d95b
6 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/smtplib.py
View file

@ -46,7 +46,7 @@ import re
import email.utils
import base64
import hmac
from email.base64mime import encode as encode_base64
from email.base64mime import body_encode as encode_base64
from sys import stderr
__all__ = ["SMTPException","SMTPServerDisconnected","SMTPResponseException",
@ -529,10 +529,10 @@ class SMTP:
def encode_cram_md5(challenge, user, password):
challenge = base64.decodestring(challenge)
response = user + " " + hmac.HMAC(password, challenge).hexdigest()
return encode_base64(response, eol="")
return encode_base64(response)
def encode_plain(user, password):
return encode_base64("\0%s\0%s" % (user, password), eol="")
return encode_base64("\0%s\0%s" % (user, password))
AUTH_PLAIN = "PLAIN"
@ -574,10 +574,10 @@ class SMTP:
AUTH_PLAIN + " " + encode_plain(user, password))
elif authmethod == AUTH_LOGIN:
(code, resp) = self.docmd("AUTH",
"%s %s" % (AUTH_LOGIN, encode_base64(user, eol="")))
"%s %s" % (AUTH_LOGIN, encode_base64(user)))
if code != 334:
raise SMTPAuthenticationError(code, resp)
(code, resp) = self.docmd(encode_base64(password, eol=""))
(code, resp) = self.docmd(encode_base64(password))
elif authmethod is None:
raise SMTPException("No suitable authentication method found.")
if code not in (235, 503):