- Launchpad #257269: 'raise SystemExit' with a PythonScript could shu…

…tdown a complete Zope instance
zopefoundation · Aug 12, 2008 · 16045d6 · 16045d6
1 parent 4cfdb10
commit 16045d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/PythonScript.py b/PythonScript.py
@@ -322,7 +322,11 @@ def _exec(self, bound_names, args, kw):
         g['__file__'] = getattr(self, '_filepath', None) or self.get_filepath()
         f = new.function(fcode, g, None, fadefs)
 
-        result = f(*args, **kw)
+        try:
+            result = f(*args, **kw)
+        except SystemExit:
+            raise ValueError('SystemExit can not raised with a PythonScript')
+
         if keyset is not None:
             # Store the result in the cache.
             self.ZCacheable_set(result, keywords=keyset)

diff --git a/tests/testPythonScript.py b/tests/testPythonScript.py
@@ -222,6 +222,11 @@ def testDateTime(self):
         res = self._newPS("return DateTime('2007/12/10').strftime('%d.%m.%Y')")()
         self.assertEqual(res, '10.12.2007')
 
+    def testRaiseSystemExitLaunchpad257269(self):
+        ps = self._newPS("raise SystemExit")
+        self.assertRaises(ValueError, ps)
+
+
 
 class TestPythonScriptErrors(PythonScriptTestBase):