Merge branch 'master' into fix-368

CHANGES.rst

@@ -8,7 +8,25 @@ 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.0b6 (unreleased)
+4.0b7 (unreleased)
+------------------
+
+Bugfixes
+++++++++
+
+- Fix a bug with scopes in scripts with zconsole, which made it impossible to
+  reach global imports in the script within a function.
+
+- Fix handling of non-ASCII characters in URLs on Python 2 introduced on 4.0b5.
+  (`#380 <https://github.com/zopefoundation/Zope/pull/380>`_)
+
+- Fix zodbupdate conversion of ``OFS.Image.Pdata`` objects.
+
+- Install the `ipaddress` package only on Python 2.7 as it is part of the
+  stdlib in Python 3.
+  (`#368 <https://github.com/zopefoundation/Zope/issues/368>`_)
+
+4.0b6 (2018-10-11)
 ------------------
 
 Breaking changes
@@ -22,19 +40,27 @@ Breaking changes
 New features
 ++++++++++++
 
+- Style the ZMI using Bootstrap.
+  (`#249 <https://github.com/zopefoundation/Zope/pull/249>`_ and
+  `#307 <https://github.com/zopefoundation/Zope/pull/307>`_)
+
 - Add zconsole module for running scripts and interactive mode.
   See `documentation <https://zope.readthedocs.io/en/latest/operation.html#debugging-zope>`_.
 
+- Add support for Python 3.7.
+
 - Restore support for XML-RPC when using the WSGI publisher - dropped in 4.0a2.
 
 - Add a minimum ``buildout.cfg`` suggestion in the docs for creating ``wsgi``
   instances.
 
-- Inlcude the ``zmi.styles`` repository in this package to break a circular
-  dependency.
-  (`#307 <https://github.com/zopefoundation/Zope/pull/307>`_)
+- Render an error message when trying to save DTML code containing a
+  SyntaxError in ZMI of a DTMLMethod or DTMLDocument.
 
-- Add support for Python 3.7.
+- Render an error message when trying to upload a file without choosing one
+  in ZMI of a DTMLMethod or DTMLDocument.
+
+- Update dependencies to newest versions.
 
 Bugfixes
 ++++++++
@@ -56,10 +82,6 @@ Bugfixes
 - Fix upload and rendering of text files.
   (`#240 <https://github.com/zopefoundation/Zope/pull/240>`_)
 
-- Include the ``zmi.styles`` repository in this package to break a circular
-  dependency.
-  (`#307 <https://github.com/zopefoundation/Zope/pull/307>`_)
-
 - Work around Python bug (https://bugs.python.org/issue27777)
   when reading request bodies not encoded as application/x-www-form-urlencoded
   or multipart/form-data.
@@ -78,9 +100,9 @@ Bugfixes
   to interact well with plone.testing's patching of the global site manager.
   (`#361 <https://github.com/zopefoundation/Zope/pull/361>`_)
 
-- Install the `ipaddress` package only on Python 2.7 as it is part of the
-  stdlib in Python 3.
-  (`#368 <https://github.com/zopefoundation/Zope/issues/368>`_)
+- Add a backwards compatible shim for ``AccessRule`` which was removed in 4.0a1
+  but can exist in legacy databases.
+  (`#321 <https://github.com/zopefoundation/Zope/issue/321>`_)
 
 
 4.0b5 (2018-05-18)
@@ -276,7 +298,7 @@ Breaking changes
 - Removed ``OFS.ZDOM``. `OFS.SimpleItem.Item` now implements `getParentNode()`.
 
 - Removed special code to create user folders and page templates while creating
-  new ``OFS.Folder` instances.
+  new ``OFS.Folder`` instances.
 
 - Removed the `App.version_txt.getZopeVersion` API, you can use
   ``pkg_resources.get_distribution('Zope').version`` instead.

README.rst

@@ -16,6 +16,10 @@
         :target: https://pypi.org/project/Zope/
         :alt: Supported Python versions
 
+.. image:: https://requires.io/github/zopefoundation/Zope/requirements.svg?branch=master
+        :target: https://requires.io/github/zopefoundation/Zope/requirements/?branch=master
+        :alt: Requirements Status
+
 .. contents::
 
 Introduction

buildout.cfg

@@ -19,18 +19,6 @@ parts =
     requirements
 sources-dir = develop
 auto-checkout =
-    Persistence
-    AccessControl
-    Products.BTreeFolder2
-    Products.ZCatalog
-    RestrictedPython
-    Products.MailHost
-    Products.PythonScripts
-    Products.Sessions
-    Products.TemporaryFolder
-    Products.SiteErrorLog
-    ExtensionClass
-    DocumentTemplate
 
 [testenv]
 PYTHONHASHSEED = random

constraints.txt

@@ -1,89 +1,90 @@
-AccessControl==4.0b4
-Acquisition==4.4.4
+AccessControl==4.0b6
+Acquisition==4.5
 AuthEncoding==4.0.0
-BTrees==4.5.0
+BTrees==4.5.1
 Chameleon==3.4
-DateTime==4.2
-DocumentTemplate==3.0b3
-ExtensionClass==4.3.0
-Missing==4.0.1
-MultiMapping==4.0
+DateTime==4.3
+DocumentTemplate==3.0b5
+ExtensionClass==4.4
+Missing==4.1
+MultiMapping==4.1
 PasteDeploy==1.5.2
-Persistence==3.0b3
-Products.BTreeFolder2==4.0.0
+Persistence==3.0b4
+Products.BTreeFolder2==4.1
 Products.ZCTextIndex==4.0.2
-Products.ZCatalog==4.1
-Record==3.4
-RestrictedPython==4.0b5
-WSGIProxy2==0.4.4
-WebOb==1.8.1
-WebTest==2.0.29
-ZConfig==3.2.0
+Products.ZCatalog==4.2
+Record==3.5
+RestrictedPython==4.0b6
+WSGIProxy2==0.4.5
+WebOb==1.8.2
+WebTest==2.0.32
+ZConfig==3.3.0
 ZEO==5.2.0
 ZODB==5.4.0
-ZServer==4.0b1 ; python_version < '3.0'
+ZServer==4.0b3 ; python_version < '3.0'
 Zope2==4.0b1
 five.globalrequest==99.1
-five.localsitemanager==3.1
+five.localsitemanager==3.2.1
 funcsigs==1.0.2
 future==0.16.0
 ipaddress==1.0.22
 mock==2.0.0
-pbr==4.0.3
-persistent==4.2.4.2
-pytz==2018.4
+pbr==4.3.0
+persistent==4.4.2
+pytz==2018.5
 shutilwhich==1.1.0
 six==1.11.0
 transaction==2.2.1
 waitress==1.1.0
 z3c.pt==3.1.0
-zExceptions==4.0
+zExceptions==4.1
 zc.lockfile==1.3.0
 zdaemon==4.2.0
-zodbpickle==1.0.1
+zodbpickle==1.0.2
 zope.annotation==4.6.0
-zope.browser==2.2.0
-zope.browsermenu==4.3.0
-zope.browserpage==4.2.0
-zope.browserresource==4.2.1
+zope.browser==2.3
+zope.browsermenu==4.4
+zope.browserpage==4.3.0
+zope.browserresource==4.3
 zope.cachedescriptors==4.3.1
-zope.component==4.4.1
+zope.component==4.5
 zope.componentvocabulary==2.1.0
-zope.configuration==4.1.0
-zope.container==4.2.1
-zope.contentprovider==4.1.0
-zope.contenttype==4.3.0
+zope.configuration==4.3.0
+zope.container==4.2.2
+zope.contentprovider==4.2
+zope.contenttype==4.4
 zope.datetime==4.2.0
-zope.deferredimport==4.2.1
+zope.deferredimport==4.3
 zope.deprecation==4.3.0
-zope.dottedname==4.2.0
-zope.event==4.3.0
-zope.exceptions==4.2.0
+zope.dottedname==4.3
+zope.event==4.4
+zope.exceptions==4.3
 zope.filerepresentation==4.2.0
-zope.formlib==4.4
-zope.globalrequest==1.4
-zope.i18n==4.3.1
-zope.i18nmessageid==4.1.0
+zope.formlib==4.5.0
+zope.globalrequest==1.5
+zope.hookable==4.2.0
+zope.i18n==4.4
+zope.i18nmessageid==4.2
 zope.interface==4.5.0
-zope.lifecycleevent==4.2.0
-zope.location==4.1.0
-zope.pagetemplate==4.3.0
-zope.processlifetime==2.2.0
-zope.proxy==4.3.0
-zope.ptresource==4.1.0
-zope.publisher==4.3.2
-zope.ramcache==2.2.0
-zope.schema==4.5.0
-zope.security==4.2.2
-zope.sendmail==4.1.0
-zope.sequencesort==4.0.1
-zope.site==4.1.0
-zope.size==4.2.0
-zope.structuredtext==4.2.0
-zope.tal==4.3.1
-zope.tales==4.2.0
-zope.testbrowser==5.2.4
-zope.testing==4.6.2
-zope.testrunner==4.8.1
-zope.traversing==4.2.0
-zope.viewlet==4.1.0
+zope.lifecycleevent==4.3.0
+zope.location==4.2
+zope.pagetemplate==4.4
+zope.processlifetime==2.3.0
+zope.proxy==4.3.1
+zope.ptresource==4.2.0
+zope.publisher==5.0
+zope.ramcache==2.3
+zope.schema==4.9.1
+zope.security==4.3.0
+zope.sendmail==4.2
+zope.sequencesort==4.1.2
+zope.site==4.2
+zope.size==4.3
+zope.structuredtext==4.3
+zope.tal==4.4
+zope.tales==4.3
+zope.testbrowser==5.3
+zope.testing==4.7
+zope.testrunner==4.9
+zope.traversing==4.3
+zope.viewlet==4.2

docs/INSTALL-virtualenv.rst

@@ -20,9 +20,9 @@ Python 3
 
 .. note::
   You might need to install ``virtualenv``.
-  
+
   For example, on Ubuntu 18.04 you have to type the following::
-  
+
     $ sudo apt-get install python3-venv
 
 Python 2.7
@@ -37,7 +37,7 @@ system, then call:
    New python executable in zope/bin/python2.7
    Installing setuptools, pip, wheel...done.
    $ cd zope
-   
+
 Make sure you use at least version ``12.0.1`` of `virtualenv`
 (Calling ``virtualenv --version`` tells you the used version
 number.).
@@ -46,7 +46,7 @@ the file format of ``requirements-full.txt`` used in `Zope`.
 
 .. note::
   It is recommended to update pip to the lastest version. ::
-  
+
     $ path/to/your/pip install --upgrade pip
 
 
@@ -65,22 +65,22 @@ version of ``requirements-full.txt`` in the URL, replacing 4.0b6 in the example
    Obtaining Zope
    ...
    Successfully installed ...
-   
+
 .. note::
   In order to compile C code, you might need to install the Python development package.
-  
+
   For Ubuntu 18.04, you have to type the following::
-  
+
     $ sudo apt-get install python3-dev
 
 You can also install Zope using a single requirements file. Note that this
-installation method might install packages that are not actually needed (i.e.
-are not listed in the ``install_requires`` section of ``setup.py``
+installation method might install packages that are not actually needed (i. e.
+are not listed in the ``install_requires`` section of ``setup.py``):
 
- .. code-block:: sh
+.. code-block:: sh
 
--   $ bin/pip install \
--   -r https://zopefoundation.github.io/Zope/releases/4.0b6/requirements-full.txt
+    $ bin/pip install \
+    -r https://zopefoundation.github.io/Zope/releases/4.0b6/requirements-full.txt
 
 
 If you are on Python 2 and want to use ZServer instead of WSGI , you'll have to

docs/index.rst

@@ -9,6 +9,7 @@ Contents:
    WHATSNEW
    INSTALL-buildout
    INSTALL-virtualenv
+   INSTALL-pipenv
    operation
    USERS
    ZMI