Merge branch 'master' into deprecated_splitport_splittype

.gitignore

@@ -1,5 +1,6 @@
 *.egg-info
 *.py?
+*.profraw
 .Python
 .coverage
 .coverage.*

.travis.yml

@@ -2,8 +2,6 @@ language: python
 
 matrix:
     include:
-        - python: "2.7"
-          env: TOXENV=lint-py27
         - python: "3.6"
           env: TOXENV=lint-py36
         - python: "2.7"
@@ -15,15 +13,10 @@ matrix:
         - python: "3.7"
           env: TOXENV=py37
           dist: xenial
-        - python: "3.7-dev"
-          env: TOXENV=py37
-          dist: xenial
         - python: "3.8-dev"
           env: TOXENV=py38
           dist: xenial
     allow_failures:
-        - python: "2.7"
-          env: TOXENV=lint-py27
         - python: "3.6"
           env: TOXENV=lint-py36
 
@@ -37,8 +30,6 @@ script:
 after_success:
     - coverage combine
     - coveralls
-    # Bails out for non-tags
-    - ./update_index.sh
 
 notifications:
     email: mh@gocept.com

CHANGES.rst

@@ -8,17 +8,87 @@ https://zope.readthedocs.io/en/2.13/CHANGES.html
 For the change log of the alpha versions see
 https://github.com/zopefoundation/Zope/blob/4.0a6/CHANGES.rst
 
-4.0b9 (unreleased)
+4.0b10 (unreleased)
+-------------------
+
+Fixes
++++++
+
+- Resurrected copyright and license page
+  (`#482 <https://github.com/zopefoundation/Zope/issues/482>`_)
+
+- Fix FindSupport binary value handling 
+  (`#406 <https://github.com/zopefoundation/Zope/issues/406>`_)
+
+- Fix remove double quoting in ``ZPublisher.HTTPRequest.search_type``
+  (`#511 <https://github.com/zopefoundation/Zope/issues/511>`_)
+
+- Fix subscript access on Page Template ``macros`` attribute
+  (`#210 <https://github.com/zopefoundation/Zope/issues/210>`_)
+
+- Fix ``OFS.interfaces`` attribute declarations to match reality
+  (`#498 <https://github.com/zopefoundation/Zope/issues/498>`_)
+
+- Fix handling of DTML in Ace editor
+  (`#489 <https://github.com/zopefoundation/Zope/issues/489>`_)
+
+- Fix error when not selecting a file for upload in Files and Images
+  (`#492 <https://github.com/zopefoundation/Zope/issues/492>`_)
+
+- Fix ZMI add handling of ``len(filtered_meta_types()) == 1`` 
+  (`#505 <https://github.com/zopefoundation/Zope/issues/505>`_)
+
+- Fix ZMI add handling of ``addItemSelect`` form
+  (`#506 <https://github.com/zopefoundation/Zope/issues/506>`_)
+
+- Don't always flag PubBeforeAbort and PubBeforeAbort as retry
+  (`#502 <https://github.com/zopefoundation/Zope/pull/502>`_)
+
+Other changes
++++++++++++++
+
+- Make sure the WSGI Response object respects lock semantics
+  (`#216 <https://github.com/zopefoundation/Zope/issues/216>`_)
+
+- Specify supported Python versions using ``python_requires`` in setup.py
+  (`#481 <https://github.com/zopefoundation/Zope/issues/481>`_)
+
+- Removed references to separate ``Products.ZCTextIndex``
+  (`516 <https://github.com/zopefoundation/Zope/issues/516>`_)
+
+- Provide additional links on PyPI with ``project_urls`` in ``setup.py``
+  (`#434 <https://github.com/zopefoundation/Zope/issues/434>`_)
+
+- Resurrect automatic support for ``standard_error_message`` DTML Method
+  (`#238 <https://github.com/zopefoundation/Zope/issues/238>`_)
+
+
+4.0b9 (2019-02-09)
 ------------------
 
+Breaking changes
+++++++++++++++++
+
+- Remove support for Bobo Call Interface
+  (`#462 <https://github.com/zopefoundation/Zope/pull/462>`_)
+
+- Remove support for ``management_page_charset``
+  (`#313 <https://github.com/zopefoundation/Zope/issues/313>`_)
+
 Features
 ++++++++
 
 - Add preliminary support for Python 3.8. as of 3.8.0a1 is released.
 
+- Recreate ``App.version_txt.getZopeVersion``
+  (`#411 <https://github.com/zopefoundation/Zope/issues/411>`_)
+
 Fixes
 +++++
 
+- Fix display of ZMI breadcrumbs with non-ASCII path elements
+  (`#401 <https://github.com/zopefoundation/Zope/issues/401>`_)
+
 - Make sure conflicts are always retried and not masked by exception views
   (`#413 <https://github.com/zopefoundation/Zope/issues/413>`_)
 
@@ -31,18 +101,18 @@ Fixes
 - Show the content add widget again on ZCatalogs
   (`ZCatalog#45 <https://github.com/zopefoundation/Products.ZCatalog/issues/45>`_)
 
-- Improved showing/hiding of the left-hand tree pane
+- Improve showing/hiding of the left-hand tree pane
   (`#457 <https://github.com/zopefoundation/Zope/issues/457>`_)
 
-- Recreate ``App.version_txt.getZopeVersion``
-  (`#411 <https://github.com/zopefoundation/Zope/issues/411>`_)
-
 - Restore the `View` ZMI tab on folders and their subclasses
   (`#449 <https://github.com/zopefoundation/Zope/issues/449>`_)
 
 - Don't error out when showing permissions for a non-existent user
   (`#437 <https://github.com/zopefoundation/Zope/issues/437>`_)
 
+- Fix ZMI listing view for narrow displays.
+  (`#471 <https://github.com/zopefoundation/Zope/pull/471>`_)
+
 Other changes
 +++++++++++++
 
@@ -53,14 +123,7 @@ Other changes
 - Remove obsolete environment variable "Z_DEBUG_MODE"
   (`#445 <https://github.com/zopefoundation/Zope/issues/445>`_)
 
-Breaking changes
-++++++++++++++++
-
-- Removed support for Bobo Call Interface
- (`#462 <https://github.com/zopefoundation/Zope/pull/462>`_)
-
-- Removed support for ``management_page_charset``
- (`#313 <https://github.com/zopefoundation/Zope/issues/313>`_)
+- Update dependencies to newest versions.
 
 
 4.0b8 (2018-12-14)

buildout.cfg

@@ -19,7 +19,11 @@ parts =
     requirements
 sources-dir = develop
 auto-checkout =
-    RestrictedPython
+    Products.BTreeFolder2
+    Products.MailHost
+    Products.PythonScripts
+    Products.SiteErrorLog
+    Products.ZCatalog
 
 [testenv]
 PYTHONHASHSEED = random

constraints.txt

@@ -2,7 +2,7 @@ AccessControl==4.0b6
 Acquisition==4.5
 AuthEncoding==4.1
 BTrees==4.5.1
-Chameleon==3.5
+Chameleon==3.6
 DateTime==4.3
 DocumentTemplate==3.0b5
 ExtensionClass==4.4
@@ -11,14 +11,13 @@ MultiMapping==4.1
 PasteDeploy==2.0.1
 Persistence==3.0b4
 Products.BTreeFolder2==4.1
-Products.ZCTextIndex==4.0.2
-Products.ZCatalog==4.2
+Products.ZCatalog==4.3
 Record==3.5
-RestrictedPython==4.0b7
+RestrictedPython==4.0b8
 WSGIProxy2==0.4.5
-WebOb==1.8.4
+WebOb==1.8.5
 WebTest==2.0.32
-ZConfig==3.3.0
+ZConfig==3.4.0
 ZEO==5.2.0
 ZODB==5.5.1
 ZServer==4.0b3 ; python_version < '3.0'
@@ -29,18 +28,18 @@ funcsigs==1.0.2
 future==0.17.1
 ipaddress==1.0.22
 mock==2.0.0
-pbr==5.1.1
+pbr==5.1.2
 persistent==4.4.3
-pytz==2018.7
+pytz==2018.9
 shutilwhich==1.1.0
 six==1.12.0
 transaction==2.4.0
-waitress==1.1.0
-z3c.pt==3.1.0
+waitress==1.2.1
+z3c.pt==3.2.0
 zExceptions==4.1
 zc.lockfile==1.4
 zdaemon==4.3
-zodbpickle==1.0.2
+zodbpickle==1.0.3
 zope.annotation==4.7.0
 zope.browser==2.3
 zope.browsermenu==4.4
@@ -75,16 +74,16 @@ zope.ptresource==4.2.0
 zope.publisher==5.0.1
 zope.ramcache==2.3
 zope.schema==4.9.3
-zope.security==4.3.0
-zope.sendmail==4.2
+zope.security==4.3.1
+zope.sendmail==4.2.1
 zope.sequencesort==4.1.2
 zope.site==4.2.2
 zope.size==4.3
 zope.structuredtext==4.3
 zope.tal==4.4
 zope.tales==4.3
-zope.testbrowser==5.3.1
+zope.testbrowser==5.3.2
 zope.testing==4.7
 zope.testrunner==4.9.2
 zope.traversing==4.3.1
-zope.viewlet==4.2
+zope.viewlet==4.2.1

docs/maintenance.rst

@@ -30,13 +30,15 @@ Steps for creating a new Zope release
   packages and update version information where necessary::
 
   $ bin/checkversions buildout.cfg
-  
+
 .. note::
 
     There is no version pin for `zc.buildout` as it has to be installed
     in the virtual environment but `checkversions` also prints its
     version number.
 
+- Garden the change log.
+
 - Run the tests::
 
   $ bin/tox
@@ -63,9 +65,9 @@ Steps for creating a new Zope release
 - Upload the tagged release to PyPI::
 
     $ bin/release
-    
+
     or
-    
+
     $ git tag <TAG-NAME>
     $ bin/zopepy setup.py egg_info -RDb '' sdist bdist_wheel upload --sign
 
@@ -77,10 +79,10 @@ Steps for creating a new Zope release
 
 - Commit and push the changes.
 
-- Check the visible releases on readthedocs.org at (should default to
-  showing the active branches): https://readthedocs.org/projects/zope/versions/
+- Check that the changes have been propagated to https://zope.readthedocs.io/en/latest/changes.html.
+  (This should be done automatically via web hooks defined in GitHub and RTD.)
 
-- Update https://zopefoundation.github.io/Zope/ (This is needed until https://github.com/zopefoundation/Zope/issues/244 is fixed.)::
+- Update https://zopefoundation.github.io/Zope/::
 
   $ git checkout gh-pages
   $ ./build_index.sh