summaryrefslogtreecommitdiffstats
path: root/Lib/email
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2011-03-15 16:49:33 (GMT)
committerR David Murray <rdmurray@bitdance.com>2011-03-15 16:49:33 (GMT)
commite1773cd3cb40f9c91bd048793a5e145a1b4ef7a7 (patch)
tree267f0c810bfed46698e3cd0e9f198e5c535d0c0a /Lib/email
parentdf1d00a1e3d5ec1ee994ab0b002b974f22a6eaa4 (diff)
parent106f8e3ea48e247d6f4354890994f0b16fdcc8c4 (diff)
downloadcpython-e1773cd3cb40f9c91bd048793a5e145a1b4ef7a7.zip
cpython-e1773cd3cb40f9c91bd048793a5e145a1b4ef7a7.tar.gz
cpython-e1773cd3cb40f9c91bd048793a5e145a1b4ef7a7.tar.bz2
Merge obsolete comment removal from 3.2.
Diffstat (limited to 'Lib/email')
-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 b821bfd..28835d0 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')