[CMF-checkins] SVN: CMF/branches/1.4/CMFCore/CachingPolicyManager.py Appears that Zope 2.6 does not like Expression(''). Working around

[Stefan H. Holek]

Log message for revision 38433:
  Appears that Zope 2.6 does not like Expression(''). Working around
  by setting self._etag_func to None instead.
  

Changed:
  U   CMF/branches/1.4/CMFCore/CachingPolicyManager.py

-=-
Modified: CMF/branches/1.4/CMFCore/CachingPolicyManager.py
===================================================================
--- CMF/branches/1.4/CMFCore/CachingPolicyManager.py	2005-09-09 14:49:44 UTC (rev 38432)
+++ CMF/branches/1.4/CMFCore/CachingPolicyManager.py	2005-09-09 14:50:03 UTC (rev 38433)
@@ -167,6 +167,10 @@
         if s_max_age_secs is not None:
             s_max_age_secs = int( s_max_age_secs )
 
+        etag_expr = None
+        if etag_func:
+            etag_expr = Expression( text=etag_func )
+
         self._policy_id = policy_id
         self._predicate = Expression( text=predicate )
         self._mtime_func = Expression( text=mtime_func )
@@ -180,7 +184,7 @@
         self._private = int( private )
         self._no_transform = int( no_transform )
         self._vary = vary
-        self._etag_func = Expression( text=etag_func )
+        self._etag_func = etag_expr
         self._enable_304s = int ( enable_304s )
 
     def getPolicyId( self ):