MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

add encoding to MemorySource load_from_file()

master
Emmanuelle Vargas-Gonzalez 2020-01-15 14:15:08 -05:00
parent 25cfb25ef3
commit c467f198c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stix2/datastore/memory.py
View File

@ -359,8 +359,8 @@ class MemorySource(DataSource):
return all_data return all_data
def load_from_file(self, file_path, version=None): def load_from_file(self, file_path, version=None, encoding='utf-8'):
with io.open(os.path.abspath(file_path), "r") as f: with io.open(os.path.abspath(file_path), "r", encoding=encoding) as f:
stix_data = json.load(f) stix_data = json.load(f)
_add(self, stix_data, self.allow_custom, version) _add(self, stix_data, self.allow_custom, version)