mirror of https://github.com/MISP/PyMISP
Merge branch 'master' of github.com:MISP/PyMISP
commit
b1e3490268
|
@ -18,4 +18,4 @@ if __name__ == '__main__':
|
||||||
me = MISPEvent()
|
me = MISPEvent()
|
||||||
me.load_file(args.input)
|
me.load_file(args.input)
|
||||||
|
|
||||||
result = misp.update_event(args.event, me)
|
result = misp.update_event(me, args.event)
|
||||||
|
|
|
@ -46,7 +46,7 @@ class MISPFileCache(object):
|
||||||
def _load_json(path: Path) -> Union[dict, None]:
|
def _load_json(path: Path) -> Union[dict, None]:
|
||||||
if not path.exists():
|
if not path.exists():
|
||||||
return None
|
return None
|
||||||
with path.open('r') as f:
|
with path.open('r', encoding='utf-8') as f:
|
||||||
if HAS_RAPIDJSON:
|
if HAS_RAPIDJSON:
|
||||||
data = load(f)
|
data = load(f)
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -81,7 +81,7 @@ class VTReportObject(AbstractMISPObjectGenerator):
|
||||||
report = requests.get(url, params=params)
|
report = requests.get(url, params=params)
|
||||||
report_json = report.json()
|
report_json = report.json()
|
||||||
if report_json["response_code"] == 1:
|
if report_json["response_code"] == 1:
|
||||||
return report
|
return report_json
|
||||||
else:
|
else:
|
||||||
error_msg = "{}: {}".format(resource, report_json["verbose_msg"])
|
error_msg = "{}: {}".format(resource, report_json["verbose_msg"])
|
||||||
raise InvalidMISPObject(error_msg)
|
raise InvalidMISPObject(error_msg)
|
||||||
|
|
Loading…
Reference in New Issue