summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2015-07-31 09:01:38 +1200
committerRobert Collins <rbtcollins@hp.com>2015-07-31 09:01:38 +1200
commit78378e89393b99e20c45cb6131fa9d7fa120baac (patch)
tree69035e51121127dd66592266c04fea3da0913980 /Lib/imaplib.py
parentMerge with 3.4 (diff)
parentIssue #23779: imaplib raises TypeError if authenticator tries to abort. (diff)
downloadcpython-78378e89393b99e20c45cb6131fa9d7fa120baac.tar.gz
cpython-78378e89393b99e20c45cb6131fa9d7fa120baac.tar.bz2
cpython-78378e89393b99e20c45cb6131fa9d7fa120baac.zip
Issue #23779: imaplib raises TypeError if authenticator tries to abort.
Patch from Craig Holmquist.
Diffstat (limited to 'Lib/imaplib.py')
-rw-r--r--Lib/imaplib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 970b6a537f7..4e8a4bb6fa4 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -1353,7 +1353,7 @@ class _Authenticator:
def process(self, data):
ret = self.mech(self.decode(data))
if ret is None:
- return '*' # Abort conversation
+ return b'*' # Abort conversation
return self.encode(ret)
def encode(self, inp):