[Zope3-checkins] SVN: Zope3/trunk/ Issue 665: ZCML swallowing KeyboardInterrupt and SystemExit.

[Tres Seaver]

Log message for revision 68964:
  Issue 665:  ZCML swallowing KeyboardInterrupt and SystemExit.

Changed:
  U   Zope3/trunk/doc/CHANGES.txt
  U   Zope3/trunk/src/zope/configuration/config.py
  U   Zope3/trunk/src/zope/configuration/xmlconfig.py

-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt	2006-07-04 01:36:34 UTC (rev 68963)
+++ Zope3/trunk/doc/CHANGES.txt	2006-07-04 01:47:35 UTC (rev 68964)
@@ -16,6 +16,8 @@
 
     Bug fixes
 
+      - Fixed issue 665: ZCML swallowing KeyboardInterrupt / SystemExit.
+
       - Fixed issue 525: DateWidget ru-format.
         Added new Date(time)I18nWidget. Note: if you plan to use
         DatetimeI18nWidget with timezone information take a look

Modified: Zope3/trunk/src/zope/configuration/config.py
===================================================================
--- Zope3/trunk/src/zope/configuration/config.py	2006-07-04 01:36:34 UTC (rev 68963)
+++ Zope3/trunk/src/zope/configuration/config.py	2006-07-04 01:47:35 UTC (rev 68964)
@@ -610,6 +610,8 @@
                     continue
                 try:
                     callable(*args, **kw)
+                except (KeyboardInterrupt, SystemExit):
+                    raise
                 except:
                     if testing:
                         raise

Modified: Zope3/trunk/src/zope/configuration/xmlconfig.py
===================================================================
--- Zope3/trunk/src/zope/configuration/xmlconfig.py	2006-07-04 01:36:34 UTC (rev 68963)
+++ Zope3/trunk/src/zope/configuration/xmlconfig.py	2006-07-04 01:47:35 UTC (rev 68964)
@@ -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