summaryrefslogtreecommitdiffstats
path: root/Lib/email/iterators.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/email/iterators.py')
-rw-r--r--Lib/email/iterators.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/email/iterators.py b/Lib/email/iterators.py
index e99f228..3adc4a0 100644
--- a/Lib/email/iterators.py
+++ b/Lib/email/iterators.py
@@ -12,7 +12,7 @@ __all__ = [
]
import sys
-from cStringIO import StringIO
+from io import StringIO
@@ -39,7 +39,7 @@ def body_line_iterator(msg, decode=False):
"""
for subpart in msg.walk():
payload = subpart.get_payload(decode=decode)
- if isinstance(payload, basestring):
+ if isinstance(payload, str):
for line in StringIO(payload):
yield line
@@ -63,11 +63,11 @@ def _structure(msg, fp=None, level=0, include_default=False):
if fp is None:
fp = sys.stdout
tab = ' ' * (level * 4)
- print >> fp, tab + msg.get_content_type(),
+ print(tab + msg.get_content_type(), end='', file=fp)
if include_default:
- print >> fp, '[%s]' % msg.get_default_type()
+ print(' [%s]' % msg.get_default_type(), file=fp)
else:
- print >> fp
+ print(file=fp)
if msg.is_multipart():
for subpart in msg.get_payload():
_structure(subpart, fp, level+1, include_default)