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

Merge branch 'master' into master

pull/358/head
Vincent-CIRCL 2019-03-01 09:07:45 +01:00 committed by GitHub
parent a06c8cf5b8 33186b6ec8
commit 83ef1b851e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pymisp/tools/reportlab_generator.py
View File

@ -6,6 +6,7 @@ import base64
import logging import logging
import pprint import pprint
from io import BytesIO from io import BytesIO
import sys import sys
if sys.version_info.major >= 3: if sys.version_info.major >= 3:
@ -1206,7 +1207,6 @@ class Object():
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
def create_flowable_table_from_objects(self, misp_event, config=None): def create_flowable_table_from_objects(self, misp_event, config=None):
''' '''
Returns a list of flowables representing the list of objects of a misp event. Returns a list of flowables representing the list of objects of a misp event.
@ -1314,7 +1314,6 @@ class Galaxy():
return flowable_table return flowable_table
def create_flowable_table_from_galaxies(self, misp_event): def create_flowable_table_from_galaxies(self, misp_event):
''' '''
Returns a Table (flowable) to add to a pdf, representing the list of galaxies of an event or a misp event Returns a Table (flowable) to add to a pdf, representing the list of galaxies of an event or a misp event

1
tests/test_reportlab.py
View File

@ -35,6 +35,7 @@ class TestMISPEvent(unittest.TestCase):
self.moduleconfig = ["MISP_base_url_for_dynamic_link", "MISP_name_for_metadata", "Activate_textual_description", self.moduleconfig = ["MISP_base_url_for_dynamic_link", "MISP_name_for_metadata", "Activate_textual_description",
"Activate_galaxy_description"] "Activate_galaxy_description"]
def init_event(self): def init_event(self):
self.mispevent.info = 'This is a test' self.mispevent.info = 'This is a test'
self.mispevent.distribution = 1 self.mispevent.distribution = 1