[Spambayes-checkins] spambayes/pspam pop.py,1.3,1.4

[Skip Montanaro]

Update of /cvsroot/spambayes/spambayes/pspam
In directory sc8-pr-cvs1:/tmp/cvs-serv28377/pspam

Modified Files:
	pop.py 
Log Message:
Unify StringIO imports to always try cStringIO and fallback to StringIO


Index: pop.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pspam/pop.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pop.py	7 Nov 2002 22:30:10 -0000	1.3
--- pop.py	15 Jan 2003 22:45:11 -0000	1.4
***************
*** 29,33 ****
  import SocketServer
  import asyncore
! import cStringIO
  import email
  import re
--- 29,37 ----
  import SocketServer
  import asyncore
! try:
!     import cStringIO as StringIO
! except ImportError:
!     import StringIO
! 
  import email
  import re
***************
*** 190,194 ****
          if multiline:
              # Collect the entire response as one string
!             resp = cStringIO.StringIO()
              while 1:
                  line = self.pop_rfile.readline()
--- 194,198 ----
          if multiline:
              # Collect the entire response as one string
!             resp = StringIO.StringIO()
              while 1:
                  line = self.pop_rfile.readline()