Merge pull request #305 from dawid-czarnecki/feature/include_proposals

chg: Include proposals in attributes search
pull/306/head
Raphaël Vinot 2018-11-28 10:39:51 +01:00 committed by GitHub
commit 1343432e32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions

View File

@ -1148,6 +1148,7 @@ class PyMISP(object):
:param to_ids: return only the attributes with the to_ids flag set
:param deleted: also return the deleted attributes
:param event_timestamp: the timestamp of the last modification of the event (attributes controller only)). Can be a list (from->to)
:param includeProposals: return shadow attributes if True
:param async_callback: The function to run when results are returned
"""
query = {}
@ -1203,6 +1204,7 @@ class PyMISP(object):
query['metadata'] = kwargs.pop('metadata', None)
if controller == 'attributes':
query['event_timestamp'] = kwargs.pop('event_timestamp', None)
query['includeProposals'] = kwargs.pop('includeProposals', None)
# Cleanup
query = {k: v for k, v in query.items() if v is not None}