From d90042536dcc94720db3ef845a2dd8a285059fd4 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Fri, 4 Apr 2003 02:48:18 +0000 Subject: Backporting: typed_subpart_iterator(): Fix these to use non-deprecated APIs, i.e. get_content_maintype() and get_content_subtype(). --- Lib/email/_compat21.py | 4 ++-- Lib/email/_compat22.py | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Lib/email/_compat21.py b/Lib/email/_compat21.py index 0e0b3d0..1e1f666 100644 --- a/Lib/email/_compat21.py +++ b/Lib/email/_compat21.py @@ -63,7 +63,7 @@ def typed_subpart_iterator(msg, maintype='text', subtype=None): """ parts = [] for subpart in msg.walk(): - if subpart.get_main_type('text') == maintype: - if subtype is None or subpart.get_subtype('plain') == subtype: + if subpart.get_content_maintype() == maintype: + if subtype is None or subpart.get_content_subtype() == subtype: parts.append(subpart) return parts diff --git a/Lib/email/_compat22.py b/Lib/email/_compat22.py index ec2d2f8..fc1d32a 100644 --- a/Lib/email/_compat22.py +++ b/Lib/email/_compat22.py @@ -1,7 +1,7 @@ # Copyright (C) 2002 Python Software Foundation # Author: barry@zope.com -"""Module containing compatibility functions for Python 2.1. +"""Module containing compatibility functions for Python 2.2. """ from __future__ import generators @@ -9,6 +9,13 @@ from __future__ import division from cStringIO import StringIO from types import StringTypes +# Python 2.2.x where x < 1 lacks True/False +try: + True, False +except NameError: + True = 1 + False = 0 + # This function will become a method of the Message class @@ -58,6 +65,6 @@ def typed_subpart_iterator(msg, maintype='text', subtype=None): 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: + if subpart.get_content_maintype() == maintype: + if subtype is None or subpart.get_content_subtype() == subtype: yield subpart -- cgit v0.12