Products.PythonScripts 5.0__py3-none-any.whl → 5.1__py3-none-any.whl

Products/PythonScripts/PythonScript.py

@@ -16,7 +16,9 @@ This product provides support for Script objects containing restricted
 Python code.
 """
 
+import importlib.abc
 import importlib.util
+import linecache
 import marshal
 import os
 import re
@@ -56,7 +58,7 @@ LOG = getLogger('PythonScripts')
 Python_magic = importlib.util.MAGIC_NUMBER
 
 # This should only be incremented to force recompilation.
-Script_magic = 4
+Script_magic = 5
 _log_complaint = (
     'Some of your Scripts have stale code cached.  Since Zope cannot'
     ' use this code, startup will be slightly slower until these Scripts'
@@ -97,6 +99,17 @@ def manage_addPythonScript(self, id, title='', file=None, REQUEST=None,
     return ''
 
 
+class PythonScriptLoader(importlib.abc.Loader):
+    """PEP302 loader to display source code in tracebacks
+    """
+
+    def __init__(self, source):
+        self._source = source
+
+    def get_source(self, name):
+        return self._source
+
+
 class PythonScript(Script, Historical, Cacheable):
     """Web-callable scripts written in a safe subset of Python.
 
@@ -179,12 +192,12 @@ class PythonScript(Script, Historical, Cacheable):
         if self.wl_isLocked():
             raise ResourceLockedError('The script is locked via WebDAV.')
 
+        if not file:
+            return self.ZPythonScriptHTML_editForm(
+                self, REQUEST,
+                manage_tabs_message='No file specified',
+                manage_tabs_type='warning')
         if not isinstance(file, str):
-            if not file:
-                return self.ZPythonScriptHTML_editForm(
-                    self, REQUEST,
-                    manage_tabs_message='No file specified',
-                    manage_tabs_type='warning')
             file = file.read()
 
         self.write(file)
@@ -234,7 +247,7 @@ class PythonScript(Script, Historical, Cacheable):
             self._params,
             body=self._body or 'pass',
             name=self.id,
-            filename=self.meta_type,
+            filename=getattr(self, '_filepath', None) or self.get_filepath(),
             globalize=bind_names)
 
         code = compile_result.code
@@ -261,6 +274,7 @@ class PythonScript(Script, Historical, Cacheable):
                                fc.co_argcount)
         self.Python_magic = Python_magic
         self.Script_magic = Script_magic
+        linecache.clearcache()
         self._v_change = 0
 
     def _newfun(self, code):
@@ -331,6 +345,8 @@ class PythonScript(Script, Historical, Cacheable):
             PythonScriptTracebackSupplement, self, -1)
         safe_globals['__file__'] = getattr(
             self, '_filepath', None) or self.get_filepath()
+        safe_globals['__loader__'] = PythonScriptLoader(self._body)
+
         function = types.FunctionType(
             function_code, safe_globals, None, function_argument_definitions)
 
@@ -556,6 +572,7 @@ InitializeClass(PythonScript)
 
 class PythonScriptTracebackSupplement:
     """Implementation of ITracebackSupplement"""
+
     def __init__(self, script, line=0):
         self.object = script
         # If line is set to -1, it means to use tb_lineno.

Products/PythonScripts/tests/testPythonScript.py

@@ -15,6 +15,7 @@ import contextlib
 import io
 import os
 import sys
+import traceback
 import unittest
 import warnings
 from urllib.error import HTTPError
@@ -241,7 +242,8 @@ class TestPythonScriptNoAq(PythonScriptTestBase):
         self.assertEqual(ps.read(), ps.manage_DAVget())
 
     def test_PUT_native_string(self):
-        ps = makerequest(self._filePS('complete'))
+        container = DummyFolder('container')
+        ps = makerequest(self._filePS('complete').__of__(container))
         self.assertEqual(ps.title, 'This is a title')
         self.assertEqual(ps.body(), 'print(foo+bar+baz)\nreturn printed\n')
         self.assertEqual(ps.params(), 'foo, bar, baz=1')
@@ -265,7 +267,8 @@ return \xe4\xe9\xee\xf6\xfc
         self.assertEqual(ps.params(), 'oops')
 
     def test_PUT_bytes(self):
-        ps = makerequest(self._filePS('complete'))
+        container = DummyFolder('container')
+        ps = makerequest(self._filePS('complete').__of__(container))
         self.assertEqual(ps.title, 'This is a title')
         self.assertEqual(ps.body(), 'print(foo+bar+baz)\nreturn printed\n')
         self.assertEqual(ps.params(), 'foo, bar, baz=1')
@@ -588,3 +591,46 @@ class PythonScriptBrowserTests(FunctionalTestCase):
 
         # Cleanup
         noSecurityManager()
+
+
+class TestTraceback(FunctionalTestCase, PythonScriptTestBase):
+
+    def _format_exception(self):
+        return "".join(traceback.format_exception(*sys.exc_info()))
+
+    def test_source_code_in_traceback(self):
+        ps = self._newPS("1 / 0")
+        try:
+            ps()
+        except ZeroDivisionError:
+            formatted_exception = self._format_exception()
+        self.assertIn("1 / 0", formatted_exception)
+
+        ps.write("2 / 0")
+        try:
+            ps()
+        except ZeroDivisionError:
+            formatted_exception = self._format_exception()
+        self.assertIn("2 / 0", formatted_exception)
+
+    def test_multiple_scripts_in_traceback(self):
+        from Products.PythonScripts.PythonScript import manage_addPythonScript
+
+        script1_body = "container.script2()"
+        manage_addPythonScript(
+            self.folder,
+            "script1",
+            file=script1_body,
+        )
+        script2_body = "1 / 0"
+        manage_addPythonScript(
+            self.folder,
+            "script2",
+            file=script2_body,
+        )
+        try:
+            self.folder.script1()
+        except ZeroDivisionError:
+            formatted_exception = self._format_exception()
+        self.assertIn(script1_body, formatted_exception)
+        self.assertIn(script2_body, formatted_exception)

Products/PythonScripts/www/pyScriptEdit.dtml

@@ -16,7 +16,7 @@
 			<div class="form-group row ">
 				<label for="params" class="form-label col-sm-3 col-md-2">Parameter List</label>
 				<div class="col-sm-9 col-md-10">
-					<input id="params" class="form-control" type="text" name="params" value="&dtml-params;" />
+					<input id="params" class="form-control code" type="text" name="params" value="&dtml-params;" />
 				</div>
 			</div>
 		</dtml-with>

{Products.PythonScripts-5.0.dist-info → Products.PythonScripts-5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.PythonScripts
-Version: 5.0
+Version: 5.1
 Summary: Provides support for restricted execution of Python scripts in Zope.
 Home-page: https://github.com/zopefoundation/Products.PythonScripts
 Author: Zope Foundation and Contributors
@@ -16,22 +16,23 @@ Classifier: License :: OSI Approved :: Zope Public License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 License-File: LICENSE.txt
 Requires-Dist: setuptools
 Requires-Dist: AccessControl
 Requires-Dist: Acquisition
 Requires-Dist: DateTime
 Requires-Dist: DocumentTemplate
-Requires-Dist: RestrictedPython (>=4.0b5)
+Requires-Dist: RestrictedPython >=4.0b5
 Requires-Dist: zExceptions
-Requires-Dist: Zope (>=4.1.2)
+Requires-Dist: Zope >=4.1.2
 
 .. image:: https://github.com/zopefoundation/Products.PythonScripts/actions/workflows/tests.yml/badge.svg
    :target: https://github.com/zopefoundation/Products.PythonScripts/actions/workflows/tests.yml
@@ -125,6 +126,19 @@ in the Products directory.
 Changelog
 =========
 
+5.1 (2024-10-16)
+----------------
+
+- Fix behavior when uploading no file in ``Zope >= 5.8.1``.
+
+- Add support for Python 3.12 and 3.13
+
+- Drop support for Python 3.7.
+
+- Show Python Scripts source code in tracebacks.
+  `#64 <https://github.com/zopefoundation/Products.PythonScripts/issues/64>`_
+
+
 5.0 (2023-02-01)
 ----------------
 

{Products.PythonScripts-5.0.dist-info → Products.PythonScripts-5.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-Products.PythonScripts-5.0-py3.11-nspkg.pth,sha256=nq2GLEDBKV9G0i4LEhkEEQT0gMqQlG1ToxVfs90lBMs,549
-Products/PythonScripts/PythonScript.py,sha256=I9UNQfBjqM0LbNEVtkGzq5W5gZR_qNSsBVjNxw6pMzQ,20540
+Products.PythonScripts-5.1-py3.11-nspkg.pth,sha256=nq2GLEDBKV9G0i4LEhkEEQT0gMqQlG1ToxVfs90lBMs,549
+Products/PythonScripts/PythonScript.py,sha256=akLe6wdOQjpwy_AsTH9VPIerEBHV4hOaYCTAACrX3TQ,20940
 Products/PythonScripts/Utility.py,sha256=o_v9f8K9Apmz7nuyO3sx5MszFCg573LEA_HbPepo6zQ,860
 Products/PythonScripts/__init__.py,sha256=iJZv-69KQR73xMaN08IUeTR3Xua1Ga9CB1U_k8BE6YM,2210
 Products/PythonScripts/configure.zcml,sha256=oEllo95Kz_TbT-o33fkM3K7eJekI9UtYq7VheP3TQ80,222
@@ -7,7 +7,7 @@ Products/PythonScripts/standard.py,sha256=q7Y9HmwoNeep9Ge2TZPIxOHeSJuum0Gws_Gky0
 Products/PythonScripts/Extensions/RemotePS.py,sha256=GThnZEHNoyEYkeYySqEUk2mLZgaUYTYBimIIexc7edA,612
 Products/PythonScripts/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 Products/PythonScripts/tests/testBindings.py,sha256=nd5yJl0SOpJVguSDgkzZG43j_wzs7yTXR5zf44BhScc,9454
-Products/PythonScripts/tests/testPythonScript.py,sha256=I2cTYSKC-u4iFBoiGAX8z3LP9Mqa4tq2MAjwRY4pw_k,21632
+Products/PythonScripts/tests/testPythonScript.py,sha256=He8_FpTehy1wp8kBoXCHkcY4Wpimu6MUaPOThv8HO_4,23102
 Products/PythonScripts/tests/tscripts/big_boolean.ps,sha256=pnSjggXHNB4p2HAGaoXrYdf9N-tVgISJdZkSxHevcOk,119
 Products/PythonScripts/tests/tscripts/boolean_map.ps,sha256=Ct15mgZ_j9wquw1QsgPNq1xqUU--PpFK_7MK63GvPLw,296
 Products/PythonScripts/tests/tscripts/class.__name__.ps,sha256=xYWFpxh8TWqSvJgEgCXBJysUeIIoLi9GOgvy1kG2jns,87
@@ -27,12 +27,12 @@ Products/PythonScripts/tests/tscripts/tuple_unpack_assignment.ps,sha256=ndiygHw2
 Products/PythonScripts/tests/tscripts/while_loop.ps,sha256=oka5M0x1cdqkn5KAOctBl0hFOoNf-g5eaCE1m13APYA,43
 Products/PythonScripts/www/default_content,sha256=zW3seGJBcptFXv3jecfcKEslpxCfq4leBSDzJwKtQ8w,465
 Products/PythonScripts/www/pyScriptAdd.dtml,sha256=d4IwyyX3x7nj1McBEnXPSvcZT9JBdc6OkS6fXdKcq08,1620
-Products/PythonScripts/www/pyScriptEdit.dtml,sha256=e4-KQaK-J-MIbFMAI4eXbvCc0YuJ1RvluT5jeT08cL4,3343
+Products/PythonScripts/www/pyScriptEdit.dtml,sha256=sCSnnxJlQmSo2G2464bvLgsmb5gLvWjHfNQw_BRhlMY,3348
 Products/PythonScripts/www/pyScriptProxy.dtml,sha256=xV-hC9-ZEcGi-OVde2VVMt-2_OTJ1egN-cSwCr93dBQ,1147
-Products.PythonScripts-5.0.dist-info/LICENSE.txt,sha256=PmcdsR32h1FswdtbPWXkqjg-rKPCDOo_r1Og9zNdCjw,2070
-Products.PythonScripts-5.0.dist-info/METADATA,sha256=DfI_63PWY1cKpvYBNQIxNm8gXpFKMWIzDbVpmPYmfAo,10343
-Products.PythonScripts-5.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-Products.PythonScripts-5.0.dist-info/entry_points.txt,sha256=bYD9dZ1s4djQ3ga5W8tQz28uFzu1tOOA4knl5p6wNy0,76
-Products.PythonScripts-5.0.dist-info/namespace_packages.txt,sha256=UgMr3LVXWHS9vjnxTk8VOZd7xxgBn5T02HOaMRXjjTM,9
-Products.PythonScripts-5.0.dist-info/top_level.txt,sha256=UgMr3LVXWHS9vjnxTk8VOZd7xxgBn5T02HOaMRXjjTM,9
-Products.PythonScripts-5.0.dist-info/RECORD,,
+Products.PythonScripts-5.1.dist-info/LICENSE.txt,sha256=PmcdsR32h1FswdtbPWXkqjg-rKPCDOo_r1Og9zNdCjw,2070
+Products.PythonScripts-5.1.dist-info/METADATA,sha256=cuYMXW3W74vDQD3NZ23cedPOW09duiWEBx3ItL_OyuM,10688
+Products.PythonScripts-5.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+Products.PythonScripts-5.1.dist-info/entry_points.txt,sha256=bYD9dZ1s4djQ3ga5W8tQz28uFzu1tOOA4knl5p6wNy0,76
+Products.PythonScripts-5.1.dist-info/namespace_packages.txt,sha256=UgMr3LVXWHS9vjnxTk8VOZd7xxgBn5T02HOaMRXjjTM,9
+Products.PythonScripts-5.1.dist-info/top_level.txt,sha256=UgMr3LVXWHS9vjnxTk8VOZd7xxgBn5T02HOaMRXjjTM,9
+Products.PythonScripts-5.1.dist-info/RECORD,,

{Products.PythonScripts-5.0.dist-info → Products.PythonScripts-5.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any