summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Madden <jamadden@gmail.com>2020-03-30 12:23:27 -0500
committerJason Madden <jamadden@gmail.com>2020-03-30 12:23:27 -0500
commit7a7777597005b0ff1622d5bbb682f3c44e69721d (patch)
tree6292c0ac2d0088e5063061cfbd74ee1bb4594d46
parent92decee28aaeeeb1c6746b857d11470c370bef24 (diff)
downloadzope-traversing-7a7777597005b0ff1622d5bbb682f3c44e69721d.tar.gz
Ensure all objects have consistent resolution orders.
Fixes an error where the debug namespace would re-declare everything the request already provided in a bad order.
-rw-r--r--.travis.yml7
-rw-r--r--CHANGES.rst4
-rw-r--r--src/zope/traversing/namespace.py2
-rw-r--r--tox.ini5
4 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index eecae90..87556a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,9 @@ python:
- 3.8
- pypy
- pypy3
-# Not yet, pending https://github.com/zopefoundation/zope.publisher/issues/49
-# env:
-# global:
-# - ZOPE_INTERFACE_STRICT_IRO: 1
+env:
+ global:
+ - ZOPE_INTERFACE_STRICT_IRO: 1
install:
- pip install -U pip setuptools
- pip install -U coverage coveralls
diff --git a/CHANGES.rst b/CHANGES.rst
index e9219cb..63c1c5e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,9 @@
4.4.1 (unreleased)
==================
-- Nothing changed yet.
+- Ensure all objects have consistent resolution orders. Previously,
+ the "debug" namespace's "errors" flag completely changed the
+ resolution order of the request instead of simply adding the "Debug" skin.
4.4.0 (2020-03-30)
diff --git a/src/zope/traversing/namespace.py b/src/zope/traversing/namespace.py
index fdea21a..ddf1a7c 100644
--- a/src/zope/traversing/namespace.py
+++ b/src/zope/traversing/namespace.py
@@ -673,7 +673,7 @@ class debug(view):
# if we want to enable tracebacks when also trying to
# debug a different skin?
skin = zope.component.getUtility(IBrowserSkinType, 'Debug')
- directlyProvides(request, providedBy(request) + skin)
+ directlyProvides(request, skin)
else:
raise ValueError("Unknown debug flag: %s" % flag)
return self.context
diff --git a/tox.ini b/tox.ini
index 5fef179..782cb82 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,9 +12,8 @@ extras =
test
deps =
coverage
-# Not yet, pending https://github.com/zopefoundation/zope.publisher/issues/49
-# setenv =
-# ZOPE_INTERFACE_STRICT_IRO=1
+setenv =
+ ZOPE_INTERFACE_STRICT_IRO=1
[testenv:coverage]
skip_install = true