[Python-checkins] python/dist/src/Lib/email __init__.py,1.14,1.15

[barry@users.sourceforge.net]

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

Modified Files:
	__init__.py 
Log Message:
Code cleanup and add docstrings.


Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/email/__init__.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** __init__.py	25 Sep 2002 22:07:50 -0000	1.14
--- __init__.py	28 Sep 2002 20:52:26 -0000	1.15
***************
*** 28,36 ****
  
  
  
  # Some convenience routines.  Don't import Parser and Message as side-effects
  # of importing email since those cascadingly import most of the rest of the
  # email package.
! def message_from_string(s, _class=None, strict=0):
      from email.Parser import Parser
      if _class is None:
--- 28,47 ----
  
  
+ try:
+     True, False
+ except NameError:
+     True = 1
+     False = 0
+ 
+ 
  
  # Some convenience routines.  Don't import Parser and Message as side-effects
  # of importing email since those cascadingly import most of the rest of the
  # email package.
! def message_from_string(s, _class=None, strict=False):
!     """Parse a string into a Message object model.
! 
!     Optional _class and strict are passed to the Parser constructor.
!     """
      from email.Parser import Parser
      if _class is None:
***************
*** 39,43 ****
      return Parser(_class, strict=strict).parsestr(s)
  
! def message_from_file(fp, _class=None, strict=0):
      from email.Parser import Parser
      if _class is None:
--- 50,58 ----
      return Parser(_class, strict=strict).parsestr(s)
  
! def message_from_file(fp, _class=None, strict=False):
!     """Read a file and parse its contents into a Message object model.
! 
!     Optional _class and strict are passed to the Parser constructor.
!     """
      from email.Parser import Parser
      if _class is None: