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

[barry@users.sourceforge.net]

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

Modified Files:
	__init__.py 
Log Message:
__version__: Bump to 2.4

Move the imports of Parser and Message inside the
message_from_string() and message_from_file() functions.  This way
just "import email" won't suck in most of the submodules of the
package.

Note: this will break code that relied on "import email" giving you a
bunch of the submodules, but that was never documented and should not
have been relied on.


Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/email/__init__.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** __init__.py	12 Sep 2002 03:44:50 -0000	1.13
--- __init__.py	25 Sep 2002 22:07:50 -0000	1.14
***************
*** 5,9 ****
  """
  
! __version__ = '2.3.1'
  
  __all__ = ['Charset',
--- 5,9 ----
  """
  
! __version__ = '2.4'
  
  __all__ = ['Charset',
***************
*** 29,39 ****
  
  
! # Some convenience routines
! from email.Parser import Parser as _Parser
! from email.Message import Message as _Message
! 
! def message_from_string(s, _class=_Message, strict=0):
!     return _Parser(_class, strict=strict).parsestr(s)
  
! def message_from_file(fp, _class=_Message, strict=0):
!     return _Parser(_class, strict=strict).parse(fp)
--- 29,46 ----
  
  
! # 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:
!         from email.Message import Message
!         _class = Message
!     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:
!         from email.Message import Message
!         _class = Message
!     return Parser(_class, strict=strict).parse(fp)