Commit 30e6f16d authored by Malthe Borch's avatar Malthe Borch

Use `in` operator instead of deprecated `has_key`.

parent e68ae88e
...@@ -8,6 +8,10 @@ http://docs.zope.org/zope2/releases/. ...@@ -8,6 +8,10 @@ http://docs.zope.org/zope2/releases/.
2.13.12 (unreleased) 2.13.12 (unreleased)
-------------------- --------------------
- Use ``in`` operator instead of deprecated ``has_key`` method (which
is not implemented by ``OFS.ObjectManager``). This fixes an issue
with WebDAV requests for skin objects.
- Updated distributions: - Updated distributions:
- Products.ZCatalog = 2.13.22 - Products.ZCatalog = 2.13.22
......
...@@ -540,9 +540,9 @@ class BaseRequest: ...@@ -540,9 +540,9 @@ class BaseRequest:
if (no_acquire_flag and if (no_acquire_flag and
hasattr(parents[1], 'aq_base') and hasattr(parents[1], 'aq_base') and
not hasattr(parents[1],'__bobo_traverse__')): not hasattr(parents[1],'__bobo_traverse__')):
if not (hasattr(parents[1].aq_base, entry_name) or base = parents[-1].aq_base
parents[1].aq_base.has_key(entry_name)): if not (hasattr(base, entry_name) or entry_name in base):
raise AttributeError, entry_name raise AttributeError(entry_name)
# After traversal post traversal hooks aren't available anymore # After traversal post traversal hooks aren't available anymore
del self._post_traverse del self._post_traverse
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment