[PyWebMail-Checkins] webmail/webmail/server/cgi_server content.py, 1.4, 1.5 xmailbox.py, 1.1, NONE

[Michael D. <du...@us...>]

Update of /cvsroot/pywebmail/webmail/webmail/server/cgi_server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23086

Modified Files:
	content.py 
Removed Files:
	xmailbox.py 
Log Message:
xmailbox moved to utils

Index: content.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/server/cgi_server/content.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** content.py	25 Oct 2006 23:57:21 -0000	1.4
--- content.py	2 Mar 2008 17:08:28 -0000	1.5
***************
*** 3,8 ****
  try: from cStringIO import StringIO
  except: from StringIO import StringIO
- import xmailbox
  import webmail.utils.xstrings
  
  CR = '\r'
--- 3,8 ----
  try: from cStringIO import StringIO
  except: from StringIO import StringIO
  import webmail.utils.xstrings
+ from webmail.utils.xmailbox import NetscapeMailbox
  
  CR = '\r'
***************
*** 25,29 ****
  def _get_messages(mailbox='mbox'):
    mbfile = _get_mbfile(mailbox)
!   mb = xmailbox.NetscapeMailbox(open(mbfile))
    try: deleted = filter(None, webmail.utils.xstrings.normalize_lines(open(mbfile+'.del').read()).split('\n'))
    except: deleted = []
--- 25,29 ----
  def _get_messages(mailbox='mbox'):
    mbfile = _get_mbfile(mailbox)
!   mb = NetscapeMailbox(open(mbfile))
    try: deleted = filter(None, webmail.utils.xstrings.normalize_lines(open(mbfile+'.del').read()).split('\n'))
    except: deleted = []
***************
*** 170,174 ****
    print '</body></html>'
  
! def message_eml(req, message):
    msg,msgid = _get_message(message)
    assert msg, 'Message %s not found.' % (message,)
--- 170,174 ----
    print '</body></html>'
  
! def message_txt(req, message):
    msg,msgid = _get_message(message)
    assert msg, 'Message %s not found.' % (message,)
***************
*** 184,187 ****
--- 184,191 ----
      if line is None: break
      print line
+   req.content_type = 'text/plain'
+ 
+ def message_eml(req, message):
+   message_txt(req, message)
    req.content_type = 'message/rfc822'
  
***************
*** 368,377 ****
          return getattr(self, ext)(req)
  
! index = _container(html=output_func('index_html'), xul=output_func('index_xul'))
  login = _container(html=output_func('login_html', ['usernm', 'passwd']))
  test = _container(html=output_func('test_html'))
  folders = _container(html=output_func('folders_html'))
  list_folder = _container(html=output_func('list_folder_html'))
! message = _container(html=output_func('message_html', ['message']), eml=output_func('message_eml', ['message']))
  delete = _container(html=output_func('delete_html', ['message']))
  
--- 372,384 ----
          return getattr(self, ext)(req)
  
! index = _container(html=output_func('index_html'),
!                    xul=output_func('index_xul'))
  login = _container(html=output_func('login_html', ['usernm', 'passwd']))
  test = _container(html=output_func('test_html'))
  folders = _container(html=output_func('folders_html'))
  list_folder = _container(html=output_func('list_folder_html'))
! message = _container(html=output_func('message_html', ['message']),
!                      txt=output_func('message_txt', ['message']),
!                      eml=output_func('message_eml', ['message']))
  delete = _container(html=output_func('delete_html', ['message']))
  

--- xmailbox.py DELETED ---