[jToolkit-cvs] jToolkit cidict.py,1.2,1.3 errors.py,1.2,1.3 localize.py,1.2,1.3 timecache.py,1.2,1.3

[<dav...@us...>]

Update of /cvsroot/jtoolkit/jToolkit
In directory sc8-pr-cvs1:/tmp/cvs-serv11292

Modified Files:
	cidict.py errors.py localize.py timecache.py 
Log Message:
hate to do this, but a simple update of all the files from sjsoft for the meantime...

Index: cidict.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/cidict.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cidict.py	25 Aug 2003 12:16:45 -0000	1.2
--- cidict.py	25 Sep 2003 17:36:55 -0000	1.3
***************
*** 92,97 ****
    def update(self, updatedict):
      """D.update(E) -> None.  Update D from E: for k in E.keys(): D[k] = E[k]"""
!     for key in updatedict.keys():
!       self[key] = updatedict[key]
  
    def __delitem__(self, key):
--- 92,97 ----
    def update(self, updatedict):
      """D.update(E) -> None.  Update D from E: for k in E.keys(): D[k] = E[k]"""
!     for key, value in updatedict.iteritems():
!       self[key] = value
  
    def __delitem__(self, key):

Index: errors.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/errors.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** errors.py	25 Aug 2003 12:16:45 -0000	1.2
--- errors.py	25 Sep 2003 17:36:55 -0000	1.3
***************
*** 45,49 ****
      #f.write(time.asctime()+': ')
      f.write(time.strftime('%Y-%m-%d %H:%M:%S')+': ')
!     f.write(message)
      f.write('\n')
      f.close()
--- 45,52 ----
      #f.write(time.asctime()+': ')
      f.write(time.strftime('%Y-%m-%d %H:%M:%S')+': ')
!     if type(message) == unicode:
!       f.write(message.encode('iso8859'))
!     else:
!       f.write(message)
      f.write('\n')
      f.close()
***************
*** 57,61 ****
    def logaudit(self, msg, recorddict=None):
      if recorddict is not None:
!       recordstr = ', '.join([key + ':' + str(value) for key, value in recorddict.iteritems()])
      msg+=recordstr
      self.writelog(self.instance.auditfile,msg)
--- 60,64 ----
    def logaudit(self, msg, recorddict=None):
      if recorddict is not None:
!       recordstr = ', '.join([key + ':' + unicode(value) for key, value in recorddict.iteritems()])
      msg+=recordstr
      self.writelog(self.instance.auditfile,msg)

Index: localize.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/localize.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** localize.py	25 Aug 2003 12:16:45 -0000	1.2
--- localize.py	25 Sep 2003 17:36:55 -0000	1.3
***************
*** 23,26 ****
--- 23,27 ----
  
  import gettext
+ import locale
  import os.path
  from errno import ENOENT
***************
*** 93,95 ****
--- 94,120 ----
    return ManyTranslations(translations)
      
+ def getdefaultlanguage(languagelist):
+   """tries to work out the default language from a list"""
+   def reducelocale(locale):
+     pos = locale.find('_')
+     if pos == -1:
+       return locale
+     else:
+       return locale[:pos]
+   currentlocale, currentencoding = locale.getlocale()
+   try:
+     defaultlocale, defaultencoding = locale.getdefaultlocale()
+   except ValueError:
+     defaultlocale, defaultencoding = None, None
+   if currentlocale is not None:
+     if currentlocale in languagelist:
+       return currentlocale
+     elif reducelocale(currentlocale) in languagelist:
+       return reducelocale(currentlocale)
+   if defaultlocale is not None:
+     if defaultlocale in languagelist:
+       return defaultlocale
+     elif reducelocale(defaultlocale) in languagelist:
+       return reducelocale(defaultlocale)
+   return languagelist[0]
  

Index: timecache.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/timecache.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** timecache.py	25 Aug 2003 12:16:45 -0000	1.2
--- timecache.py	25 Sep 2003 17:36:55 -0000	1.3
***************
*** 38,44 ****
    def purge(self):
      """removes all items that are older then self.expiryperiod"""
!     for key, (timestamp, value) in dict.items(self):
!       if self.expired(timestamp): 
!         self.__delitem__(key)
  
    def __contains__(self, key):
--- 38,47 ----
    def purge(self):
      """removes all items that are older then self.expiryperiod"""
!     keystodelete = []
!     for key, (timestamp, value) in dict.iteritems(self):
!       if self.expired(timestamp):
!         keystodelete.append(key)
!     for key in keystodelete:
!       self.__delitem__(key)
  
    def __contains__(self, key):
***************
*** 107,111 ****
    def keys(self):
      self.purge()
!     return dict.values(self)
  
    def values(self):
--- 110,114 ----
    def keys(self):
      self.purge()
!     return dict.keys(self)
  
    def values(self):