Complete a merge of the mimelib project and the Python cvs codebases

for the email package.  The former is now just a shell project that
has some extra files for packaging for independent use (e.g. setup.py
and README).

Added a compatibility layer so that the same API can be used in Python
2.1 and 2.2/2.3 with the major differences shuffled off into helper
modules (_compat21.py and _compat22.py).

Also bumped the package version number to 2.0.3 for some fixes to be
checked in momentarily.

1 files changed, 5 insertions, 27 deletions

diff --git a/Lib/email/Iterators.py b/Lib/email/Iterators.py
index 515bac9..a6ddceb 100644
--- a/Lib/email/Iterators.py
+++ b/Lib/email/Iterators.py
@@ -4,30 +4,8 @@
 """Various types of useful iterators and generators.
 """
 
-from __future__ import generators
-from cStringIO import StringIO
-from types import StringType
-
-
-
-def body_line_iterator(msg):
-    """Iterate over the parts, returning string payloads line-by-line."""
-    for subpart in msg.walk():
-        payload = subpart.get_payload()
-        if type(payload) is StringType:
-            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_main_type('text') == maintype:
-            if subtype is None or subpart.get_subtype('plain') == subtype:
-                yield subpart
+try:
+    from email._compat22 import body_line_iterator, typed_subpart_iterator
+except SyntaxError:
+    # Python 2.1 doesn't have generators
+    from email._compat21 import body_line_iterator, typed_subpart_iterator