[PyWebMail-Checkins] webmail/webmail/client wmailbox.py,1.45,1.46
Status: Beta
Brought to you by:
dubnerm
From: Michael D. <du...@us...> - 2007-12-08 16:44:47
|
Update of /cvsroot/pywebmail/webmail/webmail/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9181 Modified Files: wmailbox.py Log Message: do we really need this? Index: wmailbox.py =================================================================== RCS file: /cvsroot/pywebmail/webmail/webmail/client/wmailbox.py,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** wmailbox.py 8 Dec 2007 08:01:23 -0000 1.45 --- wmailbox.py 8 Dec 2007 16:44:50 -0000 1.46 *************** *** 3,11 **** try: from cStringIO import StringIO except: from StringIO import StringIO import webmail.utils.xhttp.xCookie try: import cookielib except: cookielib = None ! from webmail.utils.ImmutableDict import ImmutableDict ! import webmail.utils from webmail.utils import expr_helper from webmail.utils import StringTypes --- 3,12 ---- try: from cStringIO import StringIO except: from StringIO import StringIO + import webmail.utils + import webmail.utils.xstrings import webmail.utils.xhttp.xCookie try: import cookielib except: cookielib = None ! #from webmail.utils.ImmutableDict import ImmutableDict from webmail.utils import expr_helper from webmail.utils import StringTypes *************** *** 265,269 **** for key in self.dynamic.keys(): real_id[key] = self.get(key) ! return ImmutableDict(real_id) def get_cached_result(self, base_id): if self.cache_disabled: return None --- 266,273 ---- for key in self.dynamic.keys(): real_id[key] = self.get(key) ! l = list(real_id.items()) ! l.sort() ! return tuple(l) ! #return ImmutableDict(real_id) def get_cached_result(self, base_id): if self.cache_disabled: return None |