[Zope3-checkins] SVN: Zope3/branches/3.3/ Issue 665: ZCML
swallowing KeyboardInterrupt and SystemExit.
Tres Seaver
tseaver at palladion.com
Mon Jul 3 21:36:35 EDT 2006
Log message for revision 68963:
Issue 665: ZCML swallowing KeyboardInterrupt and SystemExit.
Changed:
U Zope3/branches/3.3/doc/CHANGES.txt
U Zope3/branches/3.3/src/zope/configuration/config.py
U Zope3/branches/3.3/src/zope/configuration/xmlconfig.py
-=-
Modified: Zope3/branches/3.3/doc/CHANGES.txt
===================================================================
--- Zope3/branches/3.3/doc/CHANGES.txt 2006-07-04 01:26:28 UTC (rev 68962)
+++ Zope3/branches/3.3/doc/CHANGES.txt 2006-07-04 01:36:34 UTC (rev 68963)
@@ -10,6 +10,8 @@
Bugfixes
+ - Fixed issue 665: ZCML swallowing KeyboardInterrupt and SystemExit.
+
- Fixed issue 645: zope.testbrowser truncates document content after
goBack()
Modified: Zope3/branches/3.3/src/zope/configuration/config.py
===================================================================
--- Zope3/branches/3.3/src/zope/configuration/config.py 2006-07-04 01:26:28 UTC (rev 68962)
+++ Zope3/branches/3.3/src/zope/configuration/config.py 2006-07-04 01:36:34 UTC (rev 68963)
@@ -610,6 +610,8 @@
continue
try:
callable(*args, **kw)
+ except (KeyboardInterrupt, SystemExit):
+ raise
except:
if testing:
raise
Modified: Zope3/branches/3.3/src/zope/configuration/xmlconfig.py
===================================================================
--- Zope3/branches/3.3/src/zope/configuration/xmlconfig.py 2006-07-04 01:26:28 UTC (rev 68962)
+++ Zope3/branches/3.3/src/zope/configuration/xmlconfig.py 2006-07-04 01:36:34 UTC (rev 68963)
@@ -220,6 +220,8 @@
try:
self.context.begin(name, data, info)
+ except (KeyboardInterrupt, SystemExit):
+ raise
except:
if self.testing:
raise
@@ -324,6 +326,8 @@
try:
self.context.end()
+ except (KeyboardInterrupt, SystemExit):
+ raise
except:
if self.testing:
raise
More information about the Zope3-Checkins
mailing list