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

  a complete Zope instance

doc/CHANGES.txt

@@ -204,6 +204,9 @@ Zope Changes
 
     Bugs Fixed
 
+      - Launchpad #257269: 'raise SystemExit' with a PythonScript could shutdown
+        a complete Zope instance
+
       - DateTime conversion of datetime objects with non-pytz tzinfo. 
         Timezones() returns a copy of the timezone list (allows tests to run).
 

lib/python/Products/PythonScripts/PythonScript.py

@@ -322,7 +322,11 @@ class PythonScript(Script, Historical, Cacheable):
         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)

lib/python/Products/PythonScripts/tests/testPythonScript.py

@@ -222,6 +222,11 @@ class TestPythonScriptNoAq(PythonScriptTestBase):
         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):