Merge branch 'master' into 674-raise

.travis.yml

@@ -10,10 +10,8 @@ matrix:
           env: TOXENV=py36
         - python: "3.7"
           env: TOXENV=py37
-          dist: xenial
         - python: "3.8"
           env: TOXENV=py38
-          dist: xenial
 
 install:
     - travis_retry pip install -U pip setuptools

CHANGES.rst

@@ -13,6 +13,12 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
   the argument ``path`` is not something it can work with
   (`#674 <https://github.com/zopefoundation/Zope/issues/674>`_)
 
+- Fix error when using database minimize in the ZMI
+  (`#726 <https://github.com/zopefoundation/Zope/issues/726>`_)
+
+- Fix ``__getattr__`` signature in ``UnauthorizedBinding``
+  (`#703 <https://github.com/zopefoundation/Zope/issues/703>`_)
+
 - Remove more Python 2 support code
   (`#692 <https://github.com/zopefoundation/Zope/issues/692>`_)
 

src/Shared/DC/Scripts/Bindings.py

@@ -187,7 +187,7 @@ def __init__(self, name, wrapped):
     def __repr__(self):
         return '<UnauthorizedBinding: %s>' % self._name
 
-    def __getattr__(self, name, default=None):
+    def __getattr__(self, name):
         # Make *extra* sure that the wrapper isn't used to access
         # __call__, etc.
         if name.startswith('__'):
@@ -200,7 +200,7 @@ def __getattr__(self, name, default=None):
 
             self.__you_lose()
 
-        return guarded_getattr(self._wrapped, name, default)
+        return guarded_getattr(self._wrapped, name)
 
     def __you_lose(self):
         name = self.__dict__['_name']

src/ZPublisher/WSGIPublisher.py

@@ -331,9 +331,11 @@ def publish_module(environ, start_response,
                 with load_app(module_info) as new_mod_info:
                     with transaction_pubevents(request, response):
                         response = _publish(request, new_mod_info)
-                user = getSecurityManager().getUser()
-                if user is not None and user.getUserName() != 'Anonymous User':
-                    environ['REMOTE_USER'] = user.getUserName()
+
+                        user = getSecurityManager().getUser()
+                        if user is not None and \
+                           user.getUserName() != 'Anonymous User':
+                            environ['REMOTE_USER'] = user.getUserName()
                 break
             except TransientError:
                 if request.supports_retry():

tox.ini

@@ -10,7 +10,6 @@ envlist =
 [testenv]
 coverage_run = {env:WIN_COV:coverage run}
 commands =
-    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
     {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test alltests
     {[testenv]coverage_run} {envdir}/bin/alltests {posargs:-vc}
 skip_install = true