Products.PythonScripts 5.0__tar.gz → 5.1__tar.gz

Products.PythonScripts-5.1/.pre-commit-config.yaml

@@ -0,0 +1,28 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/zope-product
+minimum_pre_commit_version: '3.6'
+repos:
+  - repo: https://github.com/pycqa/isort
+    rev: "5.13.2"
+    hooks:
+    - id: isort
+  - repo: https://github.com/hhatto/autopep8
+    rev: "v2.3.1"
+    hooks:
+    - id: autopep8
+      args: [--in-place, --aggressive, --aggressive]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.17.0
+    hooks:
+    - id: pyupgrade
+      args: [--py38-plus]
+  - repo: https://github.com/isidentical/teyit
+    rev: 0.4.3
+    hooks:
+    - id: teyit
+  - repo: https://github.com/PyCQA/flake8
+    rev: "7.1.1"
+    hooks:
+    - id: flake8
+      additional_dependencies:
+        - flake8-debugger == 4.1.2

{Products.PythonScripts-5.0 → Products.PythonScripts-5.1}/CHANGES.rst

@@ -1,6 +1,19 @@
 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 → Products.PythonScripts-5.1}/MANIFEST.in

@@ -5,6 +5,7 @@ include *.rst
 include *.txt
 include buildout.cfg
 include tox.ini
+include .pre-commit-config.yaml
 
 recursive-include src *.py
 include src/Products/PythonScripts/www/default_content

{Products.PythonScripts-5.0 → Products.PythonScripts-5.1}/PKG-INFO

@@ -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,14 +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: zExceptions
+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
@@ -117,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.1/pyproject.toml

@@ -0,0 +1,21 @@
+# 
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/zope-product
+
+[build-system]
+requires = ["setuptools < 74"]
+build-backend = "setuptools.build_meta"
+
+[tool.coverage.run]
+branch = true
+source = ["Products.PythonScripts"]
+
+[tool.coverage.report]
+fail_under = 83
+precision = 2
+ignore_errors = true
+show_missing = true
+exclude_lines = ["pragma: no cover", "pragma: nocover", "except ImportError:", "raise NotImplementedError", "if __name__ == '__main__':", "self.fail", "raise AssertionError", "raise unittest.Skip"]
+
+[tool.coverage.html]
+directory = "parts/htmlcov"

{Products.PythonScripts-5.0 → Products.PythonScripts-5.1}/setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 0
-
 [flake8]
 doctests = 1
 no-accept-encodings = True
@@ -15,7 +12,7 @@ ignore =
 force_single_line = True
 combine_as_imports = True
 sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
-known_third_party = six, docutils, pkg_resources, pytz
+known_third_party = docutils, pkg_resources, pytz
 known_zope = 
 known_first_party = 
 default_section = ZOPE

{Products.PythonScripts-5.0 → Products.PythonScripts-5.1}/setup.py

@@ -17,7 +17,7 @@ from setuptools import setup
 
 
 setup(name='Products.PythonScripts',
-      version='5.0',
+      version='5.1',
       url='https://github.com/zopefoundation/Products.PythonScripts',
       project_urls={
           'Issue Tracker': ('https://github.com/zopefoundation/'
@@ -44,14 +44,15 @@ setup(name='Products.PythonScripts',
           'Operating System :: OS Independent',
           'Programming Language :: Python',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: 3.11',
+          'Programming Language :: Python :: 3.12',
+          'Programming Language :: Python :: 3.13',
           'Programming Language :: Python :: Implementation :: CPython',
       ],
-      python_requires='>=3.7',
+      python_requires='>=3.8',
       install_requires=[
           'setuptools',
           'AccessControl',

{Products.PythonScripts-5.0 → Products.PythonScripts-5.1}/src/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-5.0 → Products.PythonScripts-5.1}/src/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-5.0 → Products.PythonScripts-5.1}/src/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 → Products.PythonScripts-5.1}/src/Products.PythonScripts.egg-info/PKG-INFO

@@ -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,14 +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: zExceptions
+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
@@ -117,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 → Products.PythonScripts-5.1}/src/Products.PythonScripts.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+.pre-commit-config.yaml
 CHANGES.rst
 CONTRIBUTING.md
 COPYRIGHT.txt
@@ -5,6 +6,7 @@ LICENSE.txt
 MANIFEST.in
 README.rst
 buildout.cfg
+pyproject.toml
 setup.cfg
 setup.py
 tox.ini

Products.PythonScripts-5.1/tox.ini

@@ -0,0 +1,77 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/zope-product
+[tox]
+minversion = 3.18
+envlist =
+    release-check
+    lint
+    py38
+    py39
+    py310
+    py311
+    py312
+    py313
+    coverage
+
+[testenv]
+skip_install = true
+deps =
+    setuptools < 74
+    zc.buildout >= 3.1
+    wheel > 0.37
+setenv =
+commands_pre =
+    {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
+commands =
+    {envbindir}/test {posargs:-cv}
+
+[testenv:setuptools-latest]
+basepython = python3
+deps =
+    git+https://github.com/pypa/setuptools.git\#egg=setuptools
+    zc.buildout >= 3.1
+    wheel > 0.37
+
+
+[testenv:release-check]
+description = ensure that the distribution is ready to release
+basepython = python3
+skip_install = true
+deps =
+    setuptools < 74
+    twine
+    build
+    check-manifest
+    check-python-versions >= 0.20.0
+    wheel
+commands_pre =
+commands =
+    check-manifest
+    check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml
+    python -m build --sdist --no-isolation
+    twine check dist/*
+
+[testenv:lint]
+description = This env runs all linters configured in .pre-commit-config.yaml
+basepython = python3
+skip_install = true
+deps =
+    pre-commit
+commands_pre =
+commands =
+    pre-commit run --all-files --show-diff-on-failure
+
+[testenv:coverage]
+basepython = python3
+skip_install = true
+allowlist_externals =
+    {[testenv]allowlist_externals}
+    mkdir
+deps =
+    {[testenv]deps}
+    coverage[toml]
+commands =
+    mkdir -p {toxinidir}/parts/htmlcov
+    coverage run {envbindir}/test {posargs:-cv}
+    coverage html
+    coverage report

Products.PythonScripts-5.0/tox.ini

@@ -1,83 +0,0 @@
-# Generated from:
-# https://github.com/zopefoundation/meta/tree/master/config/zope-product
-[tox]
-minversion = 3.18
-envlist =
-    lint
-    py37
-    py38
-    py39
-    py310
-    py311
-    coverage
-
-[testenv]
-skip_install = true
-deps =
-    zc.buildout >= 3.0.1
-    wheel > 0.37
-commands_pre =
-    {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
-commands =
-    {envdir}/bin/test {posargs:-cv}
-
-[testenv:lint]
-basepython = python3
-commands_pre =
-    mkdir -p {toxinidir}/parts/flake8
-allowlist_externals =
-    mkdir
-commands =
-    isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py
-    flake8 {toxinidir}/src {toxinidir}/setup.py
-    check-manifest
-    check-python-versions
-deps =
-    check-manifest
-    check-python-versions
-    flake8
-    isort
-    # Useful flake8 plugins that are Python and Plone specific:
-    flake8-coding
-    flake8-debugger
-    mccabe
-
-[testenv:isort-apply]
-basepython = python3
-commands_pre =
-deps =
-    isort
-commands =
-    isort {toxinidir}/src {toxinidir}/setup.py []
-
-[testenv:coverage]
-basepython = python3
-skip_install = true
-allowlist_externals =
-    mkdir
-deps =
-    {[testenv]deps}
-    coverage
-commands =
-    mkdir -p {toxinidir}/parts/htmlcov
-    coverage run {envdir}/bin/test {posargs:-cv}
-    coverage html
-    coverage report -m --fail-under=83
-
-[coverage:run]
-branch = True
-source = Products.PythonScripts
-
-[coverage:report]
-precision = 2
-exclude_lines =
-    pragma: no cover
-    pragma: nocover
-    except ImportError:
-    raise NotImplementedError
-    if __name__ == '__main__':
-    self.fail
-    raise AssertionError
-
-[coverage:html]
-directory = parts/htmlcov