Issue #2218: bad 'error' argument to logger call.

doc/CHANGES.txt

@@ -7,13 +7,14 @@ Zope Changes
 
   Zope 2.9.6 (unreleased)
 
-   Bugs fixed                                                                                
-    
-      - Collector #2205: fixed wrong logger argument in ZRDB/Connection.py
+   Bugs fixed
 
-      - Collector #2208: rewriting/setting the 'charset' part of the content-type
-        HTTP header will be done only for 'text/*'
+      - Collector #2218: fixed wrong logger argument in OFS/Cache.py
+
+      - Collector #2205: fixed wrong logger argument in ZRDB/Connection.py
 
+      - Collector #2208: rewriting/setting the 'charset' part of the
+        content-type HTTP header will be done only for 'text/*'
 
   Zope 2.9.5 (2006/10/03)
 

lib/python/OFS/Cache.py

@@ -197,7 +197,7 @@ class Cacheable:
                                    mtime_func, default)
                 return val
             except:
-                logger.warn('ZCache_get() exception', error=sys.exc_info())
+                logger.warn('ZCache_get() exception', exc_info=sys.exc_info())
                 return default
         return default
 
@@ -214,7 +214,7 @@ class Cacheable:
                 c.ZCache_set(ob, data, view_name, keywords,
                              mtime_func)
             except:
-                logger.warn('ZCache_set() exception', error=sys.exc_info())
+                logger.warn('ZCache_set() exception', exc_info=sys.exc_info())
 
     def ZCacheable_invalidate(self, view_name='', REQUEST=None):
         '''Called after a cacheable object is edited. Causes all
@@ -231,7 +231,7 @@ class Cacheable:
             except:
                 exc = sys.exc_info()
                 try:
-                    logger.warn('ZCache_invalidate() exception', error=exc)
+                    logger.warn('ZCache_invalidate() exception', exc_info=exc)
                     message = 'An exception occurred: %s: %s' % exc[:2]
                 finally:
                     exc = None