mirror of
https://github.com/python/cpython.git
synced 2026-05-11 07:00:24 -04:00
Barry Warsaw
bb11386730
Briefly (from the NEWS file):
- Updates for the email package:
+ All deprecated APIs that in email 2.x issued warnings have been removed:
_encoder argument to the MIMEText constructor, Message.add_payload(),
Utils.dump_address_pair(), Utils.decode(), Utils.encode()
+ New deprecations: Generator.__call__(), Message.get_type(),
Message.get_main_type(), Message.get_subtype(), the 'strict' argument to
the Parser constructor. These will be removed in email 3.1.
+ Support for Python earlier than 2.3 has been removed (see PEP 291).
+ All defect classes have been renamed to end in 'Defect'.
+ Some FeedParser fixes; also a MultipartInvariantViolationDefect will be
added to messages that claim to be multipart but really aren't.
+ Updates to documentation.
68 lines
2.1 KiB
Python
68 lines
2.1 KiB
Python
# Copyright (C) 2001-2004 Python Software Foundation
|
|
# Author: Barry Warsaw
|
|
# Contact: email-sig@python.org
|
|
|
|
"""Various types of useful iterators and generators."""
|
|
|
|
import sys
|
|
from cStringIO import StringIO
|
|
|
|
|
|
|
|
# This function will become a method of the Message class
|
|
def walk(self):
|
|
"""Walk over the message tree, yielding each subpart.
|
|
|
|
The walk is performed in depth-first order. This method is a
|
|
generator.
|
|
"""
|
|
yield self
|
|
if self.is_multipart():
|
|
for subpart in self.get_payload():
|
|
for subsubpart in subpart.walk():
|
|
yield subsubpart
|
|
|
|
|
|
|
|
# These two functions are imported into the Iterators.py interface module.
|
|
# The Python 2.2 version uses generators for efficiency.
|
|
def body_line_iterator(msg, decode=False):
|
|
"""Iterate over the parts, returning string payloads line-by-line.
|
|
|
|
Optional decode (default False) is passed through to .get_payload().
|
|
"""
|
|
for subpart in msg.walk():
|
|
payload = subpart.get_payload(decode=decode)
|
|
if isinstance(payload, basestring):
|
|
for line in StringIO(payload):
|
|
yield line
|
|
|
|
|
|
def typed_subpart_iterator(msg, maintype='text', subtype=None):
|
|
"""Iterate over the subparts with a given MIME type.
|
|
|
|
Use `maintype' as the main MIME type to match against; this defaults to
|
|
"text". Optional `subtype' is the MIME subtype to match against; if
|
|
omitted, only the main type is matched.
|
|
"""
|
|
for subpart in msg.walk():
|
|
if subpart.get_content_maintype() == maintype:
|
|
if subtype is None or subpart.get_content_subtype() == subtype:
|
|
yield subpart
|
|
|
|
|
|
|
|
def _structure(msg, fp=None, level=0, include_default=False):
|
|
"""A handy debugging aid"""
|
|
if fp is None:
|
|
fp = sys.stdout
|
|
tab = ' ' * (level * 4)
|
|
print >> fp, tab + msg.get_content_type(),
|
|
if include_default:
|
|
print >> fp, '[%s]' % msg.get_default_type()
|
|
else:
|
|
print >> fp
|
|
if msg.is_multipart():
|
|
for subpart in msg.get_payload():
|
|
_structure(subpart, fp, level+1, include_default)
|