Products.PythonScripts 4.15__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-4.15 → Products.PythonScripts-5.1}/CHANGES.rst

@@ -1,6 +1,25 @@
 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)
+----------------
+
+- Drop support for Python 2.7, 3.5, 3.6.
+
+
 4.15 (2022-12-16)
 -----------------
 

{Products.PythonScripts-4.15 → Products.PythonScripts-5.1}/MANIFEST.in

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

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

@@ -1,34 +1,38 @@
 Metadata-Version: 2.1
 Name: Products.PythonScripts
-Version: 4.15
+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
-Author-email: zope-dev@zope.org
+Author-email: zope-dev@zope.dev
 License: ZPL 2.1
 Project-URL: Issue Tracker, https://github.com/zopefoundation/Products.PythonScripts/issues
 Project-URL: Sources, https://github.com/zopefoundation/Products.PythonScripts
 Classifier: Development Status :: 6 - Mature
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Zope
-Classifier: Framework :: Zope :: 4
 Classifier: Framework :: Zope :: 5
 Classifier: License :: OSI Approved :: Zope Public License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-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: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
+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
@@ -122,6 +126,25 @@ 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)
+----------------
+
+- Drop support for Python 2.7, 3.5, 3.6.
+
+
 4.15 (2022-12-16)
 -----------------
 

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-4.15 → Products.PythonScripts-5.1}/setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
 [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
+known_third_party = docutils, pkg_resources, pytz
 known_zope = 
 known_first_party = 
 default_section = ZOPE

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

@@ -17,7 +17,7 @@ from setuptools import setup
 
 
 setup(name='Products.PythonScripts',
-      version='4.15',
+      version='5.1',
       url='https://github.com/zopefoundation/Products.PythonScripts',
       project_urls={
           'Issue Tracker': ('https://github.com/zopefoundation/'
@@ -29,9 +29,9 @@ setup(name='Products.PythonScripts',
       description='Provides support for restricted execution of Python '
                   'scripts in Zope.',
       author='Zope Foundation and Contributors',
-      author_email='zope-dev@zope.org',
-      long_description=('%s\n%s' % (open('README.rst').read(),
-                                    open('CHANGES.rst').read())),
+      author_email='zope-dev@zope.dev',
+      long_description=('{}\n{}'.format(open('README.rst').read(),
+                                        open('CHANGES.rst').read())),
       packages=find_packages('src'),
       namespace_packages=['Products'],
       package_dir={'': 'src'},
@@ -39,24 +39,20 @@ setup(name='Products.PythonScripts',
           'Development Status :: 6 - Mature',
           'Environment :: Web Environment',
           'Framework :: Zope',
-          'Framework :: Zope :: 4',
           'Framework :: Zope :: 5',
           'License :: OSI Approved :: Zope Public License',
           'Operating System :: OS Independent',
           'Programming Language :: Python',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.5',
-          'Programming Language :: Python :: 3.6',
-          '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='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
+      python_requires='>=3.8',
       install_requires=[
           'setuptools',
           'AccessControl',

{Products.PythonScripts-4.15 → Products.PythonScripts-5.1}/src/Products/PythonScripts/PythonScript.py

@@ -16,15 +16,16 @@ 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
 import sys
 import types
 from logging import getLogger
-
-import six
-from six.moves.urllib.parse import quote
+from urllib.parse import quote
 
 from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import change_proxy_roles
@@ -47,27 +48,17 @@ from Shared.DC.Scripts.Script import BindingsUI
 from Shared.DC.Scripts.Script import Script
 from Shared.DC.Scripts.Script import defaultBindings
 from zExceptions import Forbidden
+from zExceptions import ResourceLockedError
 from ZPublisher.HTTPRequest import default_encoding
 
 
-try:
-    from zExceptions import ResourceLockedError
-except ImportError:
-    from webdav.Lockable import ResourceLockedError
-
 LOG = getLogger('PythonScripts')
 
 # Track the Python bytecode version
-try:
-    import importlib.util
-    Python_magic = importlib.util.MAGIC_NUMBER
-except ImportError:  # Python 2
-    import imp
-    Python_magic = imp.get_magic()
-    del imp
+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'
@@ -103,11 +94,22 @@ def manage_addPythonScript(self, id, title='', file=None, REQUEST=None,
         except Exception:
             u = REQUEST['URL1']
         if submit == 'Add and Edit':
-            u = '%s/%s' % (u, quote(id))
+            u = f'{u}/{quote(id)}'
         REQUEST.RESPONSE.redirect(u + '/manage_main')
     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.
 
@@ -190,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)
@@ -245,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
@@ -272,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):
@@ -288,7 +291,7 @@ class PythonScript(Script, Historical, Cacheable):
         safe_globals['__name__'] = 'script'
 
         safe_locals = {}
-        six.exec_(code, safe_globals, safe_locals)
+        exec(code, safe_globals, safe_locals)
         func = list(safe_locals.values())[0]
         self._v_ft = (func.__code__, safe_globals, func.__defaults__ or ())
         return func
@@ -332,7 +335,7 @@ class PythonScript(Script, Historical, Cacheable):
         if ft is None:
             __traceback_supplement__ = (
                 PythonScriptTracebackSupplement, self)
-            raise RuntimeError('%s %s has errors.' % (self.meta_type, self.id))
+            raise RuntimeError(f'{self.meta_type} {self.id} has errors.')
 
         function_code, safe_globals, function_argument_definitions = ft
         safe_globals = safe_globals.copy()
@@ -342,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)
 
@@ -433,10 +438,8 @@ class PythonScript(Script, Historical, Cacheable):
         bindmap = self.getBindingAssignments().getAssignedNames()
         bup = 0
 
-        if six.PY3 and isinstance(text, bytes):
+        if isinstance(text, bytes):
             text = text.decode(default_encoding)
-        elif six.PY2 and not isinstance(text, bytes):
-            text = text.encode(default_encoding)
 
         st = 0
         try:
@@ -520,7 +523,7 @@ class PythonScript(Script, Historical, Cacheable):
         else:
             prefix = '##'
 
-        hlines = ['%s %s "%s"' % (prefix, self.meta_type, self.id)]
+        hlines = [f'{prefix} {self.meta_type} "{self.id}"']
         mm = sorted(self._metadata_map().items())
         for kv in mm:
             hlines.append('%s=%s' % kv)
@@ -553,7 +556,7 @@ class PythonScript(Script, Historical, Cacheable):
     @security.protected(view_management_screens)
     def PrincipiaSearchSource(self):
         """Support for searching - the document's contents are searched."""
-        return '%s\n%s' % (self._params, self._body)
+        return f'{self._params}\n{self._body}'
 
     @security.protected(view_management_screens)
     def document_src(self, REQUEST=None, RESPONSE=None):
@@ -569,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-4.15 → Products.PythonScripts-5.1}/src/Products/PythonScripts/standard.py

@@ -18,7 +18,7 @@ Scripts.  It can be accessed from Python with the statement
 "import Products.PythonScripts.standard"
 """
 
-from six.moves.urllib.parse import urlencode  # NOQA
+from urllib.parse import urlencode  # NOQA
 
 from AccessControl.SecurityInfo import ModuleSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager

{Products.PythonScripts-4.15 → Products.PythonScripts-5.1}/src/Products/PythonScripts/tests/testBindings.py

@@ -21,7 +21,7 @@ from OFS.Folder import Folder
 from OFS.ObjectManager import ObjectManager
 
 
-class UnderprivilegedUser(object):
+class UnderprivilegedUser:
 
     def getId(self):
         return 'underprivileged'

{Products.PythonScripts-4.15 → Products.PythonScripts-5.1}/src/Products/PythonScripts/tests/testPythonScript.py

@@ -14,13 +14,11 @@ import codecs
 import contextlib
 import io
 import os
-import pickle
 import sys
+import traceback
 import unittest
 import warnings
-
-import six
-from six.moves.urllib.error import HTTPError
+from urllib.error import HTTPError
 
 import zExceptions
 import Zope2
@@ -41,7 +39,7 @@ HERE = os.path.dirname(__file__)
 @contextlib.contextmanager
 def warning_interceptor():
     old_stderr = sys.stderr
-    sys.stderr = stream = six.StringIO()
+    sys.stderr = stream = io.StringIO()
     try:
         yield stream
     finally:
@@ -53,7 +51,7 @@ def warning_interceptor():
 
 def readf(name):
     path = os.path.join(HERE, 'tscripts', '%s.ps' % name)
-    with open(path, 'r') as f:
+    with open(path) as f:
         return f.read()
 
 
@@ -137,7 +135,7 @@ class TestPythonScriptNoAq(PythonScriptTestBase):
         import string
         params = string.ascii_letters[:26]
         sparams = ','.join(params)
-        ps = self._newPS('##parameters=%s\nreturn %s' % (sparams, sparams))
+        ps = self._newPS(f'##parameters={sparams}\nreturn {sparams}')
         res = ps(*params)
         self.assertEqual(res, tuple(params))
 
@@ -203,8 +201,7 @@ class TestPythonScriptNoAq(PythonScriptTestBase):
         self.assertEqual(res, 'a\n')
 
     def testComplexPrint(self):
-        script = 'complex_print_py%s' % sys.version_info.major
-        res = self._filePS(script)()
+        res = self._filePS('complex_print')()
         self.assertEqual(res, 'double\ndouble\nx: 1\ny: 0 1 2\n\n')
 
     def testNSBind(self):
@@ -220,19 +217,13 @@ class TestPythonScriptNoAq(PythonScriptTestBase):
         self.assertTrue(res)
 
     def testGetSize(self):
-        script = 'complex_print_py%s' % sys.version_info.major
-        f = self._filePS(script)
+        f = self._filePS('complex_print')
         self.assertEqual(f.get_size(), len(f.read()))
 
     def testBuiltinSet(self):
         res = self._newPS('return len(set([1, 2, 3, 1]))')()
         self.assertEqual(res, 3)
 
-    @unittest.skipIf(six.PY3, 'sets module does not exist in python3')
-    def testSetModule(self):
-        res = self._newPS('from sets import Set; return len(Set([1,2,3]))')()
-        self.assertEqual(res, 3)
-
     def testDateTime(self):
         res = self._newPS(
             "return DateTime('2007/12/10').strftime('%d.%m.%Y')")()
@@ -251,11 +242,12 @@ 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')
-        new_body = u"""\
+        new_body = """\
 ## Script (Python) "complete"
 ##bind container=container
 ##bind context=context
@@ -271,16 +263,12 @@ return \xe4\xe9\xee\xf6\xfc
         ps._filepath = 'fake'
         ps.PUT(ps.REQUEST, ps.REQUEST.RESPONSE)
         self.assertEqual(ps.title, 'New Title')
-        if six.PY3:
-            self.assertEqual(ps.body(), 'return \xe4\xe9\xee\xf6\xfc\n')
-        else:
-            self.assertEqual(
-                ps.body(),
-                'return \xc3\xa4\xc3\xa9\xc3\xae\xc3\xb6\xc3\xbc\n')
+        self.assertEqual(ps.body(), 'return \xe4\xe9\xee\xf6\xfc\n')
         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')
@@ -300,12 +288,7 @@ return \xc3\xa4\xc3\xa9\xc3\xae\xc3\xb6\xc3\xbc
         ps._filepath = 'fake'
         ps.PUT(ps.REQUEST, ps.REQUEST.RESPONSE)
         self.assertEqual(ps.title, 'New Title')
-        if six.PY3:
-            self.assertEqual(ps.body(), 'return \xe4\xe9\xee\xf6\xfc\n')
-        else:
-            self.assertEqual(
-                ps.body(),
-                'return \xc3\xa4\xc3\xa9\xc3\xae\xc3\xb6\xc3\xbc\n')
+        self.assertEqual(ps.body(), 'return \xe4\xe9\xee\xf6\xfc\n')
         self.assertEqual(ps.params(), 'oops')
 
     def test_write(self):
@@ -314,7 +297,7 @@ return \xc3\xa4\xc3\xa9\xc3\xae\xc3\xb6\xc3\xbc
         ps.write(b'return 1')
         self.assertEqual(ps.body(), 'return 1\n')
 
-        ps.write(u'return 1')
+        ps.write('return 1')
         self.assertEqual(ps.body(), 'return 1\n')
 
     def test_factory(self):
@@ -391,15 +374,7 @@ return \xc3\xa4\xc3\xa9\xc3\xae\xc3\xb6\xc3\xbc
         self.assertEqual(
             script.__code__.co_varnames,
             ('a',))
-        if six.PY2:
-            self.assertEqual(script.func_code.co_argcount, 1)
-            self.assertEqual(
-                script.func_code.co_varnames,
-                ('a',))
-
         self.assertEqual(script.__defaults__, ('b',))
-        if six.PY2:
-            self.assertEqual(script.func_defaults, ('b',))
 
 
 class TestPythonScriptErrors(PythonScriptTestBase):
@@ -479,10 +454,7 @@ class TestPythonScriptGlobals(PythonScriptTestBase):
 
     def test__name__(self):
         f = self._filePS('class.__name__')
-        if six.PY3:
-            class_name = "'script.class.__name__.<locals>.foo'>"
-        else:
-            class_name = "'script.foo'>"
+        class_name = "'script.class.__name__.<locals>.foo'>"
 
         self.assertEqual(f(), (class_name, "'string'"))
 
@@ -504,11 +476,8 @@ class TestPythonScriptGlobals(PythonScriptTestBase):
 class PythonScriptInterfaceConformanceTests(unittest.TestCase):
 
     def test_class_conforms_to_IWriteLock(self):
+        from OFS.interfaces import IWriteLock
         from zope.interface.verify import verifyClass
-        try:
-            from OFS.interfaces import IWriteLock
-        except ImportError:
-            from webdav.interfaces import IWriteLock
         verifyClass(IWriteLock, PythonScript)
 
 
@@ -517,7 +486,7 @@ class PythonScriptBrowserTests(FunctionalTestCase):
 
     def setUp(self):
         from Products.PythonScripts.PythonScript import manage_addPythonScript
-        super(PythonScriptBrowserTests, self).setUp()
+        super().setUp()
 
         Zope2.App.zcml.load_site(force=True)
 
@@ -526,10 +495,8 @@ class PythonScriptBrowserTests(FunctionalTestCase):
         manage_addPythonScript(self.app, 'py_script')
 
         self.browser = Browser()
-        self.browser.addHeader(
-            'Authorization',
-            'basic {}'.format(codecs.encode(  # noqa: P101
-                b'manager:manager_pass', 'base64').decode()))
+        pw = codecs.encode(b'manager:manager_pass', 'base64').decode()
+        self.browser.addHeader('Authorization', f'basic {pw}')
         self.browser.open('http://localhost/py_script/manage_main')
 
     def test_ZPythonScriptHTML_upload__no_file(self):
@@ -626,47 +593,44 @@ class PythonScriptBrowserTests(FunctionalTestCase):
         noSecurityManager()
 
 
-class PythonScriptPickle(unittest.TestCase):
+class TestTraceback(FunctionalTestCase, PythonScriptTestBase):
 
-    @unittest.skipIf(
-        six.PY3,
-        'Pickles from python2 can not be loaded on python3')
-    def test_load_old_zope_2_pickle_recompiles(self):
-        with open(os.path.join(HERE, 'tscripts', 'ps_2.13.2.pkl'), 'rb') as f:
-            script = pickle.load(f)
-        self.assertIsInstance(script, PythonScript)
+    def _format_exception(self):
+        return "".join(traceback.format_exception(*sys.exc_info()))
 
-        self.assertEqual(
-            script.document_src(),
-            '## Script (Python) "test"\n'
-            '##bind container=container\n'
-            '##bind context=context\n'
-            '##bind namespace=\n'
-            '##bind script=script\n'
-            '##bind subpath=traverse_subpath\n'
-            '##parameters=Products_PythonScripts_version=\'2.13.2\'\n'
-            '##title=\n'
-            '##\n'
-            'return """This is an old script created with\n'
-            'Products.PythonScripts version %s\n'
-            'and Zope version 2.13.30 (on python 2.7)\n'
-            '""" % Products_PythonScripts_version\n')
+    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)
 
-        self.assertEqual(script.__code__.co_argcount, 1)
-        self.assertEqual(
-            script.__code__.co_varnames,
-            ('Products_PythonScripts_version',))
-        self.assertEqual(script.func_code.co_argcount, 1)
-        self.assertEqual(
-            script.func_code.co_varnames,
-            ('Products_PythonScripts_version',))
-        self.assertEqual(script.__defaults__, ('2.13.2',))
-        self.assertEqual(script.func_defaults, ('2.13.2',))
+        ps.write("2 / 0")
+        try:
+            ps()
+        except ZeroDivisionError:
+            formatted_exception = self._format_exception()
+        self.assertIn("2 / 0", formatted_exception)
 
-        container = makerequest(DummyFolder('container'))
-        container.REQUEST.form = {}
-        self.assertEqual(
-            script.__of__(container)(),
-            'This is an old script created with\n'
-            'Products.PythonScripts version 2.13.2\n'
-            'and Zope version 2.13.30 (on python 2.7)\n')
+    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-4.15 → 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-4.15 → Products.PythonScripts-5.1}/src/Products.PythonScripts.egg-info/PKG-INFO

@@ -1,34 +1,38 @@
 Metadata-Version: 2.1
 Name: Products.PythonScripts
-Version: 4.15
+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
-Author-email: zope-dev@zope.org
+Author-email: zope-dev@zope.dev
 License: ZPL 2.1
 Project-URL: Issue Tracker, https://github.com/zopefoundation/Products.PythonScripts/issues
 Project-URL: Sources, https://github.com/zopefoundation/Products.PythonScripts
 Classifier: Development Status :: 6 - Mature
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Zope
-Classifier: Framework :: Zope :: 4
 Classifier: Framework :: Zope :: 5
 Classifier: License :: OSI Approved :: Zope Public License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-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: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
+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
@@ -122,6 +126,25 @@ 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)
+----------------
+
+- Drop support for Python 2.7, 3.5, 3.6.
+
+
 4.15 (2022-12-16)
 -----------------
 

{Products.PythonScripts-4.15 → 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,7 +6,7 @@ LICENSE.txt
 MANIFEST.in
 README.rst
 buildout.cfg
-buildout4.cfg
+pyproject.toml
 setup.cfg
 setup.py
 tox.ini
@@ -31,8 +32,7 @@ src/Products/PythonScripts/tests/tscripts/big_boolean.ps
 src/Products/PythonScripts/tests/tscripts/boolean_map.ps
 src/Products/PythonScripts/tests/tscripts/class.__name__.ps
 src/Products/PythonScripts/tests/tscripts/complete.ps
-src/Products/PythonScripts/tests/tscripts/complex_print_py2.ps
-src/Products/PythonScripts/tests/tscripts/complex_print_py3.ps
+src/Products/PythonScripts/tests/tscripts/complex_print.ps
 src/Products/PythonScripts/tests/tscripts/fibonacci.ps
 src/Products/PythonScripts/tests/tscripts/filepath.ps
 src/Products/PythonScripts/tests/tscripts/for_loop.ps
@@ -40,7 +40,6 @@ src/Products/PythonScripts/tests/tscripts/global_is_declaration.ps
 src/Products/PythonScripts/tests/tscripts/mutate_literals.ps
 src/Products/PythonScripts/tests/tscripts/ns_bind.ps
 src/Products/PythonScripts/tests/tscripts/ns_bind_invalid.ps
-src/Products/PythonScripts/tests/tscripts/ps_2.13.2.pkl
 src/Products/PythonScripts/tests/tscripts/simple_print.ps
 src/Products/PythonScripts/tests/tscripts/subversive_except.ps
 src/Products/PythonScripts/tests/tscripts/try_except.ps

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-4.15/buildout4.cfg

@@ -1,7 +0,0 @@
-[buildout]
-extends =
-    buildout.cfg
-    http://zopefoundation.github.io/Zope/releases/4.x/versions.cfg
-
-[versions]
-Products.PythonScripts =

Products.PythonScripts-4.15/src/Products/PythonScripts/tests/tscripts/complex_print_py2.ps

@@ -1,9 +0,0 @@
-x = {'x': 1}
-y = range(3)
-
-print 'double'
-print printed,
-print 'x:', x['x']
-print 'y:', y[0], y[1], y[2]
-print
-return printed

Products.PythonScripts-4.15/tox.ini

@@ -1,90 +0,0 @@
-# Generated from:
-# https://github.com/zopefoundation/meta/tree/master/config/zope-product
-[tox]
-minversion = 3.18
-envlist =
-    lint
-    py27
-    py35
-    py36
-    py37
-    py38
-    py39
-    py310
-    py311
-    coverage
-
-[testenv]
-skip_install = true
-deps =
-    zc.buildout >= 3.0.1
-    wheel > 0.37
-commands_pre =
-    py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
-    !py27-!py35: {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
-    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
-    coverage-python-version
-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
-plugins = coverage_python_version
-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