From caa27b7823f12a971aec54f77a06280fdd84f058 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Sat, 23 May 2009 18:49:56 +0000 Subject: Fix for issue 5259: ASCII encode the username and password before passing it to encode_base64, which requires bytes in py3k. Fix by Musashi Tamura, tests by Marcin Bachry. --- Lib/smtplib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Lib/smtplib.py') diff --git a/Lib/smtplib.py b/Lib/smtplib.py index d8d717c05b..0b2a586a44 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -545,7 +545,8 @@ class SMTP: return encode_base64(response) def encode_plain(user, password): - return encode_base64("\0%s\0%s" % (user, password)) + s = "\0%s\0%s" % (user, password) + return encode_base64(s.encode('ascii'), eol='') AUTH_PLAIN = "PLAIN" -- cgit v1.2.1