diff --git a/README.md b/README.md index e1f43d2..f3e79a3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +**IMPORTANT NOTE**: This library will require **at least** python 3.6 starting the 1st of January 2020. If you have to legacy versions of python, please use PyMISP v2.4.119.1, and consider updating your system(s). Anything released within the last 2 years will do, starting with Ubuntu 18.04. + README ====== diff --git a/examples/feed-generator/generate.py b/examples/feed-generator/generate.py index 174428c..a8c95c4 100755 --- a/examples/feed-generator/generate.py +++ b/examples/feed-generator/generate.py @@ -22,7 +22,7 @@ def init(): def saveEvent(event): try: - with open(os.path.join(outputdir, f'{event["uuid"]}.json'), 'w') as f: + with open(os.path.join(outputdir, f'{event["Event"]["uuid"]}.json'), 'w') as f: json.dump(event, f, indent=2) except Exception as e: print(e) @@ -68,8 +68,8 @@ if __name__ == '__main__': if not e_feed: print(f'Invalid distribution {e.distribution}, skipping') continue - hashes += [[h, e.uuid] for h in e_feed.pop('_hashes')] - manifest.update(e_feed.pop('_manifest')) + hashes += [[h, e.uuid] for h in e_feed['Event'].pop('_hashes')] + manifest.update(e_feed['Event'].pop('_manifest')) saveEvent(e_feed) print("Event " + str(counter) + "/" + str(total) + " exported.") counter += 1 diff --git a/pymisp/data/misp-objects b/pymisp/data/misp-objects index 33a7d6b..bce1018 160000 --- a/pymisp/data/misp-objects +++ b/pymisp/data/misp-objects @@ -1 +1 @@ -Subproject commit 33a7d6b574b7354ba8243ba461bfb30db0528023 +Subproject commit bce101832597b5f62679ac0299b2b4ef4681a145