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

2002年9月10日 09:07:47 -0700

Update of /cvsroot/python/python/dist/src/Lib/email
In directory usw-pr-cvs1:/tmp/cvs-serv2067/email
Modified Files:
	_compat21.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: _compat21.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/email/_compat21.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _compat21.py	2 Jun 2002 18:58:49 -0000	1.3
--- _compat21.py	10 Sep 2002 16:07:43 -0000	1.4
***************
*** 31,34 ****
--- 31,38 ----
 
 
+ def _isstring(obj):
+ return isinstance(obj, StringType) or isinstance(obj, UnicodeType) 
+ 
+ 
 
 # 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, StringType) or isinstance(payload, UnicodeType):
 for line in StringIO(payload).readlines():
 lines.append(line)
--- 43,47 ----
 for subpart in msg.walk():
 payload = subpart.get_payload()
! if _isstring(payload):
 for line in StringIO(payload).readlines():
 lines.append(line)