[CMF-checkins] CVS: Products/CMFDefault - SyndicationTool.py:1.26.2.3

[Stefan H. Holek]

Update of /cvs-repository/Products/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv26331/CMFDefault

Modified Files:
      Tag: CMF-1_5-branch
	SyndicationTool.py 
Log Message:
CMFDefault.SyndicationTool: Zope 2.8 raises AttributeError where
earlier Zopes used to raise KeyError.


=== Products/CMFDefault/SyndicationTool.py 1.26.2.2 => 1.26.2.3 ===
--- Products/CMFDefault/SyndicationTool.py:1.26.2.2	Fri Apr 22 17:42:36 2005
+++ Products/CMFDefault/SyndicationTool.py	Mon Jun 13 05:17:38 2005
@@ -129,7 +129,7 @@
         else:
             try:
                 del self.syUpdatePeriod
-            except KeyError:
+            except (AttributeError, KeyError):
                 pass
 
         if updateFrequency is not None:
@@ -137,7 +137,7 @@
         else:
             try:
                 del self.syUpdateFrequency
-            except KeyError:
+            except (AttributeError, KeyError):
                 pass
 
         if updateBase is not None:
@@ -147,7 +147,7 @@
         else:
             try:
                 del self.syUpdateBase
-            except KeyError:
+            except (AttributeError, KeyError):
                 pass
 
         if max_items is not None:
@@ -155,7 +155,7 @@
         else:
             try:
                 del self.max_items
-            except KeyError:
+            except (AttributeError, KeyError):
                 pass
 
         if REQUEST is not None: