[Python-checkins] python/dist/src/Lib/email _compat22.py,1.3,1.4

bwarsaw@users.sourceforge.net bwarsaw@users.sourceforge.net
Tue, 10 Sep 2002 09:09:10 -0700


Update of /cvsroot/python/python/dist/src/Lib/email
In directory usw-pr-cvs1:/tmp/cvs-serv2889/email

Modified Files:
	_compat22.py 
Log Message:
_isstring(): Factor out "stringiness" test, e.g. for StringType or
UnicodeType, which is different between Python 2.1 and 2.2.


Index: _compat22.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/email/_compat22.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _compat22.py	2 Jun 2002 18:59:06 -0000	1.3
--- _compat22.py	10 Sep 2002 16:09:06 -0000	1.4
***************
*** 32,35 ****
--- 32,39 ----
  
  
+ def _isstring(obj):
+     return isinstance(obj, StringTypes)
+ 
+ 
  
  # These two functions are imported into the Iterators.py interface module.
***************
*** 39,43 ****
      for subpart in msg.walk():
          payload = subpart.get_payload()
!         if isinstance(payload, StringTypes):
              for line in StringIO(payload):
                  yield line
--- 43,47 ----
      for subpart in msg.walk():
          payload = subpart.get_payload()
!         if _isstring(payload):
              for line in StringIO(payload):
                  yield line