Merge pull request #165 from dadokkio/master

_default_attributes_parameters - if set - is a dict
pull/171/head
Raphaël Vinot 2018-01-04 10:26:10 +01:00 committed by GitHub
commit 639c75bcab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -784,8 +784,8 @@ class MISPObject(AbstractMISP):
self._default_attributes_parameters.pop('category', None) # depends on the value
self._default_attributes_parameters.pop('deleted', None) # doesn't make sense to pre-set it
self._default_attributes_parameters.pop('data', None) # in case the original in a sample or an attachment
self.distribution = self._default_attributes_parameters.distribution
self.sharing_group_id = self._default_attributes_parameters.sharing_group_id
self.distribution = self._default_attributes_parameters.pop('distribution', 5)
self.sharing_group_id = self._default_attributes_parameters.pop('sharing_group_id', None)
else:
self.distribution = 5 # Default to inherit
self.sharing_group_id = None