[Zope-Checkins] CVS: Zope/lib/python/Products/Sessions/tests - testSessionDataManager.py:1.15
Shane Hathaway
shane@cvs.zope.org
Thu, 12 Sep 2002 09:51:32 -0400
Update of /cvs-repository/Zope/lib/python/Products/Sessions/tests
In directory cvs.zope.org:/tmp/cvs-serv5622/tests
Modified Files:
testSessionDataManager.py
Log Message:
Merge of session test fix from 2_5 branch. ObjectManager._delObject() can
throw either AttributeError or KeyError; catch either.
=== Zope/lib/python/Products/Sessions/tests/testSessionDataManager.py 1.14 => 1.15 ===
--- Zope/lib/python/Products/Sessions/tests/testSessionDataManager.py:1.14 Wed Aug 14 18:25:10 2002
+++ Zope/lib/python/Products/Sessions/tests/testSessionDataManager.py Thu Sep 12 09:51:31 2002
@@ -72,16 +72,16 @@
requestName='TESTOFSESSION')
try: app._delObject(idmgr_name)
- except AttributeError: pass
+ except (AttributeError, KeyError): pass
try: app._delObject(tf_name)
- except AttributeError: pass
+ except (AttributeError, KeyError): pass
try: app._delObject(sdm_name)
- except AttributeError: pass
+ except (AttributeError, KeyError): pass
try: app._delObject('index_html')
- except AttributeError: pass
+ except (AttributeError, KeyError): pass
app._setObject(idmgr_name, bidmgr)