summaryrefslogtreecommitdiff
path: root/Lib/email/message.py
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2011-03-15 15:22:42 -0400
committerBarry Warsaw <barry@python.org>2011-03-15 15:22:42 -0400
commit254800e1502a5567c8f7c8b3d8c4f0d17b3638e3 (patch)
tree96d07b2cb14f1a3090fc4d2b357f4ed6dbc4ecef /Lib/email/message.py
parent1f5c958721a1f9329cb23b17cf5e36548855d72f (diff)
parent3796befe3780b1d2cf66ec36b96167a05ae6c58c (diff)
downloadcpython-git-254800e1502a5567c8f7c8b3d8c4f0d17b3638e3.tar.gz
Merge and resolve Misc/NEWS.
Diffstat (limited to 'Lib/email/message.py')
-rw-r--r--Lib/email/message.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/email/message.py b/Lib/email/message.py
index b821bfd622..28835d09d9 100644
--- a/Lib/email/message.py
+++ b/Lib/email/message.py
@@ -242,7 +242,7 @@ class Message:
raise TypeError('Expected list, got %s' % type(self._payload))
payload = self._payload
cte = self.get('content-transfer-encoding', '').lower()
- # payload can be bytes here, (I wonder if that is actually a bug?)
+ # payload may be bytes here.
if isinstance(payload, str):
if _has_surrogates(payload):
bpayload = payload.encode('ascii', 'surrogateescape')