From baa3f68e8f71201117cdfc0864461c37946a0820 Mon Sep 17 00:00:00 2001 From: David Glick Date: Sat, 18 Feb 2017 15:49:56 -0800 Subject: [PATCH] fix regression in traversal of plone.app.folder.base.ReplaceableWrapper --- CHANGES.rst | 5 +++++ src/ZPublisher/BaseRequest.py | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index da87d17770..2476aba955 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -42,6 +42,11 @@ Bugs Fixed [MrTango] +- Fix regression in traversing to WebDAV NullResources if the final object + in the path is a proxy that provides access to aq_inner but is not itself + an acquisition wrapper. + [davisagli] + Features Added ++++++++++++++ diff --git a/src/ZPublisher/BaseRequest.py b/src/ZPublisher/BaseRequest.py index 339b0fb87b..f0a2da26b3 100644 --- a/src/ZPublisher/BaseRequest.py +++ b/src/ZPublisher/BaseRequest.py @@ -477,8 +477,7 @@ def traverse(self, path, response=None, validated_hook=None): hasattr(object, 'aq_base') and not hasattr(object, '__bobo_traverse__')): - if (object.__parent__ is not - aq_inner(object).__parent__): + if object.__parent__ is not object.aq_inner.__parent__: object = NullResource(parents[-2], object.getId(), self).__of__(parents[-2])