diff options
| author | Barry Warsaw <barry@python.org> | 2003-03-26 17:57:25 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2003-03-26 17:57:25 (GMT) |
| commit | cd7051f698219e119558bb6ef85cdcd3e074f339 (patch) | |
| tree | dad5c15e84724831848b1b94fd5c347e664e7f6e | |
| parent | 8af56778fd7753252861baab3fa00ac3696ddbc6 (diff) | |
| download | cpython-cd7051f698219e119558bb6ef85cdcd3e074f339.zip cpython-cd7051f698219e119558bb6ef85cdcd3e074f339.tar.gz cpython-cd7051f698219e119558bb6ef85cdcd3e074f339.tar.bz2 | |
typed_subpart_iterator(): Fix these to use non-deprecated APIs,
i.e. get_content_maintype() and get_content_subtype().
Also, add True, False for Python 2.2.x where x < 2 compatibility.
| -rw-r--r-- | Lib/email/_compat22.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Lib/email/_compat22.py b/Lib/email/_compat22.py index ec2d2f8..e0f72a8 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 < 2 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 |