MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'add-objects-template-file-path' of https://github.com/neok0/PyMISP into neok0-add-objects-template-file-path

pull/175/head
Raphaël Vinot 2018-01-11 22:33:11 +01:00
parent 17cac77231 716fd2723c
commit dfac2e2a05
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pymisp/mispevent.py
View File

@ -814,6 +814,9 @@ class MISPObject(AbstractMISP):
super(MISPObject, self).__init__(**kwargs) super(MISPObject, self).__init__(**kwargs)
self.__strict = strict self.__strict = strict
self.name = name self.name = name
if kwargs.get('misp_objects_path', None):
self.__misp_objects_path = kwargs.get('misp_objects_path', None)
else:
self.__misp_objects_path = os.path.join( self.__misp_objects_path = os.path.join(
os.path.abspath(os.path.dirname(sys.modules['pymisp'].__file__)), os.path.abspath(os.path.dirname(sys.modules['pymisp'].__file__)),
'data', 'misp-objects', 'objects') 'data', 'misp-objects', 'objects')