[PyWebMail-Checkins] webmail/webmail/utils/xhttp xCookie.py, 1.7, 1.8

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

Update of /cvsroot/pywebmail/webmail/webmail/utils/xhttp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14666

Modified Files:
	xCookie.py 
Log Message:
dance around jython bug in rfc822.parsedate_tz

Index: xCookie.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/utils/xhttp/xCookie.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** xCookie.py	3 Mar 2008 19:13:35 -0000	1.7
--- xCookie.py	4 Mar 2008 05:42:58 -0000	1.8
***************
*** 50,53 ****
--- 50,57 ----
          if p[0].lower()=='expires':
            expires=rfc822.parsedate_tz(p[1])
+           if expires is not None and expires[0]<1900:
+             year = expires[0]+1900
+             if year < 1970: year += 100
+             expires = (year,)+expires[1:]
          elif p[0].lower()=='path':
            path=p[1]
***************
*** 66,70 ****
  
    def check_not_expired(self, c):
!     if c[1] is None: return 1
      try:
        return rfc822.mktime_tz(c[1]) > time.time() + time.timezone
--- 70,74 ----
  
    def check_not_expired(self, c):
!     if c[1] is None: return 0
      try:
        return rfc822.mktime_tz(c[1]) > time.time() + time.timezone