[Checkins] SVN: zope.publisher/branches/3.4/src/zope/publisher/tests/test_publisher.py Remove finally-clause to keep Python2.4 happy.
Uli Fouquet
uli at gnufix.de
Tue Jul 14 10:43:14 EDT 2009
Log message for revision 101905:
Remove finally-clause to keep Python2.4 happy.
Changed:
U zope.publisher/branches/3.4/src/zope/publisher/tests/test_publisher.py
-=-
Modified: zope.publisher/branches/3.4/src/zope/publisher/tests/test_publisher.py
===================================================================
--- zope.publisher/branches/3.4/src/zope/publisher/tests/test_publisher.py 2009-07-14 14:41:43 UTC (rev 101904)
+++ zope.publisher/branches/3.4/src/zope/publisher/tests/test_publisher.py 2009-07-14 14:43:14 UTC (rev 101905)
@@ -113,10 +113,10 @@
try:
self._publisherResults('/_item')
except Unauthorized:
+ self._unregisterExcAdapter(dontReRaiseAdapter)
self.fail('Unauthorized raised though this should '
'not happen')
- finally:
- self._unregisterExcAdapter(dontReRaiseAdapter)
+ self._unregisterExcAdapter(dontReRaiseAdapter)
def doReRaiseAdapter(context):
def shouldBeReRaised():
@@ -124,8 +124,14 @@
return shouldBeReRaised
self._registerExcAdapter(doReRaiseAdapter)
- self.failUnlessRaises(Unauthorized, self._publisherResults, '/_item')
+ raised = True
+ try:
+ self._publisherResults('/_item')
+ raised = False
+ except:
+ pass
self._unregisterExcAdapter(doReRaiseAdapter)
+ self.failUnlessEqual(raised, True)
def test_suite():
loader = unittest.TestLoader()
More information about the Checkins
mailing list