- Update to newest compatible versions of dependencies

CHANGES.rst

@@ -7,6 +7,14 @@ since the branch point at Zope 4.1.2.
 The change log for the previous version, Zope 4, is at
 https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 
+5.12.1 (unreleased)
+-------------------
+
+- Update to newest compatible versions of dependencies.
+
+- Fix Request test data for stricter ``multipart`` parser.
+
+
 5.12 (2024-01-17)
 -----------------
 

constraints.txt

@@ -1,4 +1,3 @@
-Zope==5.12
 AccessControl==7.2
 Acquisition==6.1
 AuthEncoding==5.0
@@ -9,7 +8,7 @@ Chameleon==4.4.4; python_version > '3.8'
 DateTime==5.5
 DocumentTemplate==4.6
 ExtensionClass==6.0
-Jinja2==3.1.4
+Jinja2==3.1.5
 MarkupSafe==2.1.5; python_version == '3.8'
 MarkupSafe==3.0.2; python_version > '3.8'
 Missing==5.0
@@ -19,25 +18,27 @@ PasteDeploy==3.1.0
 Persistence==5.1
 Products.BTreeFolder2==5.1
 Products.ZCatalog==7.1
-Pygments==2.18.0
+Pygments==2.19.1
 Record==4.1
 RestrictedPython==7.4
 Sphinx==7.1.2; python_version == '3.8'
 Sphinx==7.4.7; python_version == '3.9'
 Sphinx==8.1.3; python_version > '3.9'
 WSGIProxy2==0.5.1
 WebOb==1.8.9
-WebTest==3.0.1
-ZConfig==4.1
+WebTest==3.0.1; python_version == '3.8'
+WebTest==3.0.3; python_version > '3.8'
+ZConfig==4.1; python_version == '3.8'
+ZConfig==4.2; python_version > '3.8'
 ZODB==6.0
 Zope2==4.0
 alabaster==0.7.13; python_version == '3.8'
 alabaster==0.7.14; python_version == '3.9'
 alabaster==1.0.0; python_version > '3.9'
 beautifulsoup4==4.12.3
-certifi==2024.8.30
+certifi==2024.12.14
 cffi==1.17.1
-charset-normalizer==3.4.0
+charset-normalizer==3.4.1
 collective.recipe.template==2.2
 colorama==0.4.6
 docutils==0.20.1; python_version == '3.8'
@@ -49,18 +50,19 @@ idna==3.10
 imagesize==1.4.1
 importlib-metadata==8.5.0
 importlib-resources==6.4.0; python_version == '3.8'
-legacy-cgi==2.6.1
+legacy-cgi==2.6.2
 mr.developer==2.0.2
-multipart==0.2.5
-packaging==24.1
+multipart==1.2.1
+packaging==24.2
 persistent==6.1
 plone.recipe.command==1.1
 pycparser==2.22
 python-gettext==5.0
 pytz==2024.2
 requests==2.32.3
-roman==4.2
-six==1.16.0
+roman==4.2; python_version == '3.8'
+roman==5.0; python_version > '3.8'
+six==1.17.0
 snowballstemmer==2.2.0
 soupsieve==2.6
 sphinx-basic-ng==1.0.0b2
@@ -76,18 +78,20 @@ sphinxcontrib-qthelp==2.0.0; python_version > '3.8'
 sphinxcontrib-serializinghtml==1.1.5; python_version == '3.8'
 sphinxcontrib-serializinghtml==2.0.0; python_version > '3.8'
 tempstorage==6.0
-tomli==2.0.2
+tomli==2.2.1
 transaction==5.0
-urllib3==2.2.3
+urllib3==2.2.3; python_version == '3.8'
+urllib3==2.3.0; python_version > '3.8'
 waitress==3.0.0; python_version == '3.8'
-waitress==3.0.1; python_version > '3.8'
+waitress==3.0.2; python_version > '3.8'
 z3c.checkversions==2.1
 z3c.pt==4.4
 zExceptions==5.0
 zc.lockfile==3.0.post1
 zc.recipe.egg==2.0.7
 zc.recipe.testrunner==3.1
-zipp==3.20.2
+zipp==3.20.2; python_version == '3.8'
+zipp==3.21.0; python_version > '3.8'
 zodbpickle==4.1.1
 zope.annotation==5.0
 zope.browser==3.0
@@ -96,13 +100,15 @@ zope.browserpage==5.0
 zope.browserresource==5.1
 zope.cachedescriptors==5.0
 zope.component==6.0
-zope.configuration==5.0.1
+zope.configuration==5.0.1; python_version == '3.8'
+zope.configuration==6.0; python_version > '3.8'
 zope.container==6.1
 zope.contentprovider==6.0
 zope.contenttype==5.1
 zope.datetime==5.0.0
 zope.deferredimport==5.0
-zope.deprecation==5.0
+zope.deprecation==5.0; python_version == '3.8'
+zope.deprecation==5.1; python_version > '3.8'
 zope.dottedname==6.0
 zope.event==5.0
 zope.exceptions==5.2
@@ -118,7 +124,8 @@ zope.pagetemplate==5.1
 zope.processlifetime==3.0
 zope.proxy==6.1
 zope.ptresource==5.0
-zope.publisher==7.1
+zope.publisher==7.1; python_version == '3.8'
+zope.publisher==7.2; python_version > '3.8'
 zope.schema==7.0.1
 zope.security==7.3
 zope.sequencesort==5.0
@@ -129,6 +136,6 @@ zope.tal==5.0.1
 zope.tales==6.0
 zope.testbrowser==7.0
 zope.testing==5.0.1
-zope.testrunner==6.6
+zope.testrunner==6.6.1
 zope.traversing==5.0
 zope.viewlet==5.0

requirements-full.txt

@@ -1,4 +1,4 @@
-Zope==5.12
+-e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope
 AccessControl==7.2
 Acquisition==6.1
 AuthEncoding==5.0
@@ -15,23 +15,26 @@ Persistence==5.1
 RestrictedPython==7.4
 WSGIProxy2==0.5.1
 WebOb==1.8.9
-WebTest==3.0.1
-ZConfig==4.1
+WebTest==3.0.1; python_version == '3.8'
+WebTest==3.0.3; python_version > '3.8'
+ZConfig==4.1; python_version == '3.8'
+ZConfig==4.2; python_version > '3.8'
 ZODB==6.0
 Zope2==4.0
 beautifulsoup4==4.12.3
 cffi==1.17.1
-multipart==0.2.5
+multipart==1.2.1
 persistent==6.1
 pycparser==2.22
 python-gettext==5.0
 pytz==2024.2
-roman==4.2
-six==1.16.0
+roman==4.2; python_version == '3.8'
+roman==5.0; python_version > '3.8'
+six==1.17.0
 soupsieve==2.6
 transaction==5.0
 waitress==3.0.0; python_version == '3.8'
-waitress==3.0.1; python_version > '3.8'
+waitress==3.0.2; python_version > '3.8'
 z3c.pt==4.4
 zExceptions==5.0
 zc.lockfile==3.0.post1
@@ -44,13 +47,15 @@ zope.browserpage==5.0
 zope.browserresource==5.1
 zope.cachedescriptors==5.0
 zope.component==6.0
-zope.configuration==5.0.1
+zope.configuration==5.0.1; python_version == '3.8'
+zope.configuration==6.0; python_version > '3.8'
 zope.container==6.1
 zope.contentprovider==6.0
 zope.contenttype==5.1
 zope.datetime==5.0.0
 zope.deferredimport==5.0
-zope.deprecation==5.0
+zope.deprecation==5.0; python_version == '3.8'
+zope.deprecation==5.1; python_version > '3.8'
 zope.dottedname==6.0
 zope.event==5.0
 zope.exceptions==5.2
@@ -66,7 +71,8 @@ zope.pagetemplate==5.1
 zope.processlifetime==3.0
 zope.proxy==6.1
 zope.ptresource==5.0
-zope.publisher==7.1
+zope.publisher==7.1; python_version == '3.8'
+zope.publisher==7.2; python_version > '3.8'
 zope.schema==7.0.1
 zope.security==7.3
 zope.sequencesort==5.0

setup.py

@@ -29,7 +29,7 @@ def _read_file(filename):
 README = _read_file('README.rst')
 CHANGES = _read_file('CHANGES.rst')
 
-version = '5.12'
+version = '5.12.1.dev0'
 
 setup(
     name='Zope',

src/ZPublisher/tests/testHTTPRequest.py

@@ -915,7 +915,7 @@ def test_processInputs_w_large_input_gets_tempfile(self):
         req.processInputs()
         f = req.form.get('largefile')
         self.assertTrue(f.name)
-        self.assertEqual(40006, len(f.file.read()))
+        self.assertEqual(40007, len(f.file.read()))
         self.assertTrue(f.file.fileno())
         req.clear()
         self.assertTrue(f.file.closed)
@@ -929,9 +929,9 @@ def test_processInputs_with_file_upload_gets_iterator(self):
         req = self._makeOne(stdin=s, environ=environ)
         req.processInputs()
         f = req.form.get('smallfile')
-        self.assertEqual(list(f), [b'test\n'])
+        self.assertEqual(list(f), [b'test\r\n'])
         f.seek(0)
-        self.assertEqual(next(f), b'test\n')
+        self.assertEqual(next(f), b'test\r\n')
 
     def test_processInputs_BODY(self):
         s = BytesIO(b"body")
@@ -957,7 +957,7 @@ def test_processInputs_seekable_form_data(self):
         req = self._makeOne(stdin=s, environ=environ)
         req.processInputs()
         f = req.form.get('smallfile')
-        self.assertEqual(list(f), [b'test\n'])
+        self.assertEqual(list(f), [b'test\r\n'])
         self.assertEqual(req["BODY"], TEST_FILE_DATA)
         self.assertEqual(req["BODYFILE"].read(), TEST_FILE_DATA)
 
@@ -967,7 +967,7 @@ def test_processInputs_unseekable_form_data(self):
         req = self._makeOne(stdin=s, environ=environ)
         req.processInputs()
         f = req.form.get('smallfile')
-        self.assertEqual(list(f), [b'test\n'])
+        self.assertEqual(list(f), [b'test\r\n'])
         # we cannot access ``BODY`` in this case
         # as the underlying file has been read
         with self.assertRaises(KeyError):
@@ -1654,15 +1654,16 @@ def __init__(self, file):
 test
 
 --12345--
-'''
+'''.replace(b'\n', b'\r\n')
 
 TEST_FILE_DATA_UNSPECIFIED = b'''
 --12345
 Content-Disposition: form-data; name="smallfile"; filename=""
 Content-Type: application/octet-stream
 
+
 --12345--
-'''
+'''.replace(b'\n', b'\r\n')
 
 TEST_LARGEFILE_DATA = b'''
 --12345
@@ -1672,7 +1673,7 @@ def __init__(self, file):
 test %s
 
 --12345--
-''' % (b'test' * 10000)
+'''.replace(b'\n', b'\r\n') % (b'test' * 10000)
 
 TEST_ISSUE_1095_DATA = b'''
 --12345
@@ -1688,7 +1689,7 @@ def __init__(self, file):
 <body>abc</body>
 
 --12345--
-'''
+'''.replace(b'\n', b'\r\n')
 
 TEST_FIELD_CHARSET_DATA = b'''
 --12345
@@ -1697,14 +1698,14 @@ def __init__(self, file):
 
 %s
 --12345--
-''' % 'äöü'.encode("latin-1")
+'''.replace(b'\n', b'\r\n') % 'äöü'.encode("latin-1")
 
 TEST_NO_BOUNDARIES = b'''
 Content-Disposition: form-data; name="smallfile"; filename="smallfile"
 Content-Type: application/octet-stream
 
 test
-'''
+'''.replace(b'\n', b'\r\n')
 
 TEST_FIELD_INVALID_NAME = b'''
 --12345
@@ -1713,4 +1714,4 @@ def __init__(self, file):
 
 test
 --12345--
-''' % chr(173).encode("latin-1")
+'''.replace(b'\n', b'\r\n') % chr(173).encode("latin-1")