Merge branch 'master' into zmi_description_not_absolute

zopefoundation · Feb 9, 2019 · 618dd72 · 618dd72
2 parents 5af0973 + bd17e8f
commit 618dd72
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,8 +26,6 @@ matrix:
           env: TOXENV=lint-py27
         - python: "3.6"
           env: TOXENV=lint-py36
-        - python: "3.8-dev"
-          env: TOXENV=py38
 
 install:
     - travis_retry pip install -U pip setuptools

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -11,6 +11,11 @@ https://github.com/zopefoundation/Zope/blob/4.0a6/CHANGES.rst
 4.0b9 (unreleased)
 ------------------
 
+Features
+++++++++
+
+- Add preliminary support for Python 3.8. as of 3.8.0a1 is released.
+
 Fixes
 +++++
 

diff --git a/buildout.cfg b/buildout.cfg
@@ -19,6 +19,7 @@ parts =
     requirements
 sources-dir = develop
 auto-checkout =
+    RestrictedPython
 
 [testenv]
 PYTHONHASHSEED = random

diff --git a/setup.py b/setup.py
@@ -54,6 +54,7 @@ def _read_file(filename):
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",

diff --git a/src/OFS/tests/testObjectManager.py b/src/OFS/tests/testObjectManager.py
@@ -510,9 +510,9 @@ def test_manage_get_sortedObjects_quote_id(self):
         om._setObject(hash_id, SimpleItem(hash_id))
 
         result = om.manage_get_sortedObjects('id', 'asc')
-        self.assertEquals(len(result), 1)
-        self.assertEquals(result[0]['id'], hash_id)
-        self.assertEquals(result[0]['quoted_id'], quote(hash_id))
+        self.assertEqual(len(result), 1)
+        self.assertEqual(result[0]['id'], hash_id)
+        self.assertEqual(result[0]['quoted_id'], quote(hash_id))
 
 _marker = object()
 

diff --git a/src/ZPublisher/tests/test_WSGIPublisher.py b/src/ZPublisher/tests/test_WSGIPublisher.py
@@ -95,7 +95,7 @@ def test_listHeaders_includes_Date_header(self):
         headers = response.listHeaders()
         whenstr = time.strftime('%a, %d %b %Y %H:%M:%S GMT',
                                 time.gmtime(time.mktime(WHEN)))
-        self.assertTrue(('Date', whenstr) in headers)
+        self.assertIn(('Date', whenstr), headers)
 
     def test_setBody_IUnboundStreamIterator(self):
         from ZPublisher.Iterators import IUnboundStreamIterator

diff --git a/tox.ini b/tox.ini
@@ -4,6 +4,7 @@ envlist =
     py35,
     py36,
     py37,
+    py38,
     lint-py27,
     lint-py36
     coverage-report

diff --git a/versions-prod.cfg b/versions-prod.cfg
@@ -25,7 +25,7 @@ pbr = 5.1.1
 Persistence = 3.0b4
 persistent = 4.4.3
 Products.BTreeFolder2 = 4.1
-Products.ZCatalog = 4.2
+Products.ZCatalog = 4.3
 Products.ZCTextIndex = 4.0.2
 pytz = 2018.7
 Record = 3.5