Skip to content

Commit

Permalink
Merge pull request #267 from plone/266-fix-object-provides
Browse files Browse the repository at this point in the history
Make object_provides work also on tuple
  • Loading branch information
Adam Forsythe-Cheasley committed Jul 30, 2015
2 parents 46a6736 + 9aa2e3c commit e8cda67
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 3 additions & 0 deletions docs/CHANGES.rst
Expand Up @@ -4,6 +4,9 @@ Changelog
1.3.4 (unreleased)
------------------

- plone.api.content.find: object_provides arguments accepts tuples.
Fixes #266.
[ale-rt]
- Fixed plone.api.content.create in Plone 5. Refs 160.
[jaroel]

Expand Down
9 changes: 4 additions & 5 deletions src/plone/api/content.py
Expand Up @@ -549,12 +549,11 @@ def find(context=None, depth=None, **kwargs):
# Convert interfaces to their identifiers
object_provides = query.get('object_provides', [])
if object_provides:
if not isinstance(object_provides, list):
if not isinstance(object_provides, (list, tuple)):
object_provides = [object_provides]
for k, v in enumerate(object_provides):
if not isinstance(v, basestring):
object_provides[k] = v.__identifier__
query['object_provides'] = object_provides
query['object_provides'] = [
getattr(x, '__identifier__', x) for x in object_provides
]

# Make sure we don't dump the whole catalog.
catalog = portal.get_tool('portal_catalog')
Expand Down

0 comments on commit e8cda67

Please sign in to comment.