mirror of https://github.com/MISP/PyMISP
				
				
				
			Merge branch 'master' into master
						commit
						83ef1b851e
					
				|  | @ -6,6 +6,7 @@ import base64 | |||
| import logging | ||||
| import pprint | ||||
| from io import BytesIO | ||||
| 
 | ||||
| import sys | ||||
| 
 | ||||
| if sys.version_info.major >= 3: | ||||
|  | @ -1206,7 +1207,6 @@ class Object(): | |||
| 
 | ||||
|     # ---------------------------------------------------------------------- | ||||
| 
 | ||||
| 
 | ||||
|     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. | ||||
|  | @ -1314,7 +1314,6 @@ class Galaxy(): | |||
| 
 | ||||
|         return flowable_table | ||||
| 
 | ||||
| 
 | ||||
|     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 | ||||
|  |  | |||
|  | @ -35,6 +35,7 @@ class TestMISPEvent(unittest.TestCase): | |||
|         self.moduleconfig = ["MISP_base_url_for_dynamic_link", "MISP_name_for_metadata", "Activate_textual_description", | ||||
|                              "Activate_galaxy_description"] | ||||
| 
 | ||||
| 
 | ||||
|     def init_event(self): | ||||
|         self.mispevent.info = 'This is a test' | ||||
|         self.mispevent.distribution = 1 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Vincent-CIRCL
						Vincent-CIRCL