pymisp 2.5.10__tar.gz → 2.5.12__tar.gz

{pymisp-2.5.10 → pymisp-2.5.12}/CHANGELOG.txt

@@ -2,11 +2,43 @@ Changelog
 =========
 
 
+v2.5.12 (2025-05-13)
+--------------------
+
+Changes
+~~~~~~~
+- Bump version. [Raphaël Vinot]
+- Bump deps. [Raphaël Vinot]
+- Bump changelog. [Raphaël Vinot]
+
+Fix
+~~~
+- Incorrect calls in to_feed. [Raphaël Vinot]
+
+Other
+~~~~~
+- Replace deprecated ExpandedPyMISP with PyMISP. [Jure Sah]
+
+
+v2.5.10 (2025-04-04)
+--------------------
+
+Changes
+~~~~~~~
+- Bump deps, templates. [Raphaël Vinot]
+
+Fix
+~~~
+- Missing attribute in object should not be a warning (way too noisy)
+  [Raphaël Vinot]
+
+
 v2.5.9 (2025-03-26)
 -------------------
 
 Changes
 ~~~~~~~
+- Bump version, changelog. [Raphaël Vinot]
 - Make mypy happy. [Raphaël Vinot]
 - Bump deps. [Raphaël Vinot]
 - Bump deps. [Raphaël Vinot]

{pymisp-2.5.10 → pymisp-2.5.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymisp
-Version: 2.5.10
+Version: 2.5.12
 Summary: Python API for MISP.
 License: BSD-2-Clause
 Author: Raphaël Vinot
@@ -28,24 +28,24 @@ Provides-Extra: openioc
 Provides-Extra: pdfexport
 Provides-Extra: url
 Provides-Extra: virustotal
-Requires-Dist: RTFDE (>=0.1.2) ; (python_version <= "3.9") and (extra == "email")
-Requires-Dist: beautifulsoup4 (>=4.13.3) ; extra == "openioc"
+Requires-Dist: RTFDE (>=0.1.2.1) ; (python_version <= "3.9") and (extra == "email")
+Requires-Dist: beautifulsoup4 (>=4.13.4) ; extra == "openioc"
 Requires-Dist: deprecated (>=1.2.18)
 Requires-Dist: docutils (>=0.21.2) ; (python_version >= "3.11") and (extra == "docs")
-Requires-Dist: extract_msg (>=0.54.0) ; extra == "email"
-Requires-Dist: lief (>=0.16.4) ; extra == "fileobjects"
+Requires-Dist: extract_msg (>=0.54.1) ; extra == "email"
+Requires-Dist: lief (>=0.16.5) ; extra == "fileobjects"
 Requires-Dist: myst-parser (>=4.0.1) ; (python_version >= "3.11") and (extra == "docs")
 Requires-Dist: oletools (>=0.60.2) ; extra == "email"
 Requires-Dist: pydeep2 (>=0.5.1) ; extra == "fileobjects"
 Requires-Dist: pyfaup (>=1.2) ; extra == "url"
 Requires-Dist: python-dateutil (>=2.9.0.post0)
 Requires-Dist: python-magic (>=0.4.27) ; extra == "fileobjects"
-Requires-Dist: reportlab (>=4.3.1) ; extra == "pdfexport"
+Requires-Dist: reportlab (>=4.4.0) ; extra == "pdfexport"
 Requires-Dist: requests (>=2.32.3)
 Requires-Dist: sphinx (>=8.2.3) ; (python_version >= "3.11") and (extra == "docs")
-Requires-Dist: sphinx-autodoc-typehints (>=3.1.0) ; (python_version >= "3.11") and (extra == "docs")
-Requires-Dist: urllib3 (>=2.3.0) ; extra == "brotli"
-Requires-Dist: validators (>=0.34.0) ; extra == "virustotal"
+Requires-Dist: sphinx-autodoc-typehints (>=3.2.0) ; (python_version >= "3.11") and (extra == "docs")
+Requires-Dist: urllib3 (>=2.4.0) ; extra == "brotli"
+Requires-Dist: validators (>=0.35.0) ; extra == "virustotal"
 Project-URL: Documentation, https://pymisp.readthedocs.io
 Project-URL: Repository, https://github.com/MISP/PyMISP
 Project-URL: issues, https://github.com/MISP/PyMISP/issues

{pymisp-2.5.10 → pymisp-2.5.12}/examples/add_attributes_from_csv.py

@@ -3,7 +3,7 @@
 
 import csv
 from pymisp import PyMISP
-from pymisp import ExpandedPyMISP, MISPAttribute
+from pymisp import PyMISP, MISPAttribute
 from keys import misp_url, misp_key, misp_verifycert
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 import argparse
@@ -42,7 +42,7 @@ if __name__ == '__main__':
     parser.add_argument("-f", "--attr_file", required=True, help="Attribute CSV file path")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     f = open(args.attr_file, newline='')
     csv_reader = csv.reader(f, delimiter=";")

{pymisp-2.5.10 → pymisp-2.5.12}/examples/add_fail2ban_object.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from pymisp.tools import Fail2BanObject
 import argparse
 from base64 import b64decode
@@ -43,7 +43,7 @@ if __name__ == '__main__':
     parser.add_argument("-d", "--disable_new", action='store_true', default=False, help="Do not create a new Event.")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
     event_id = -1
     me = None
     if args.force_new:

{pymisp-2.5.10 → pymisp-2.5.12}/examples/add_feed.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPFeed
+from pymisp import PyMISP, MISPFeed
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -14,7 +14,7 @@ if __name__ == '__main__':
     parser.add_argument("-p", "--provider", required=True, help="Provider name")
     args = parser.parse_args()
 
-    pm = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pm = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
     feed = MISPFeed()
     feed.format = args.format
     feed.url = args.url

{pymisp-2.5.10 → pymisp-2.5.12}/examples/add_filetype_object_from_csv.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import csv
-from pymisp import ExpandedPyMISP, MISPObject
+from pymisp import PyMISP, MISPObject
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -28,7 +28,7 @@ if __name__ == '__main__':
     parser.add_argument("-f", "--attr_file", required=True, help="Attribute CSV file path")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     f = open(args.attr_file, newline='')
     csv_reader = csv.reader(f, delimiter=";")

{pymisp-2.5.10 → pymisp-2.5.12}/examples/add_generic_object.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import json
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from pymisp.tools import GenericObjectGenerator
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
@@ -19,7 +19,7 @@ if __name__ == '__main__':
     parser.add_argument("-l", "--attr_list", required=True, help="List of attributes")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     misp_object = GenericObjectGenerator(args.type.replace("|", "-"))
     misp_object.generate_attributes(json.loads(args.attr_list))

{pymisp-2.5.10 → pymisp-2.5.12}/examples/add_named_attribute.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -19,7 +19,7 @@ if __name__ == '__main__':
     parser.add_argument("-v", "--value", help="The value of the attribute")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     event = misp.add_attribute(args.event, {'type': args.type, 'value': args.value}, pythonify=True)
     print(event)

{pymisp-2.5.10 → pymisp-2.5.12}/examples/add_organisations.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPOrganisation, MISPSharingGroup
+from pymisp import PyMISP, MISPOrganisation, MISPSharingGroup
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import csv
@@ -17,7 +17,7 @@ if __name__ == '__main__':
     parser.add_argument("-c", "--csv-import", required=True, help="The CSV file containing the organizations. Format 'orgname,nationality,sector,type,contacts,uuid,local,sharingroup_uuid'")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     # CSV format
     #   orgname,nationality,sector,type,contacts,uuid,local,sharingroup

{pymisp-2.5.10 → pymisp-2.5.12}/examples/add_ssh_authorized_keys.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from pymisp.tools import SSHAuthorizedKeysObject
 import traceback
 from keys import misp_url, misp_key, misp_verifycert
@@ -15,7 +15,7 @@ if __name__ == '__main__':
     parser.add_argument("-p", "--path", required=True, help="Path to process (expanded using glob).")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
 
     for f in glob.glob(args.path):
         try:

{pymisp-2.5.10 → pymisp-2.5.12}/examples/add_user.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPUser
+from pymisp import PyMISP, MISPUser
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -12,7 +12,7 @@ if __name__ == '__main__':
     parser.add_argument("-r", "--role_id", required=True, help="Role linked to the user.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, 'json')
+    misp = PyMISP(misp_url, misp_key, misp_verifycert, 'json')
 
     user = MISPUser()
     user.email = args.email

{pymisp-2.5.10 → pymisp-2.5.12}/examples/cache_all.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 
 from keys import misp_url, misp_key, misp_verifycert
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 
 
 if __name__ == '__main__':
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
     misp.cache_all_feeds()

{pymisp-2.5.10 → pymisp-2.5.12}/examples/create_events.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -14,7 +14,7 @@ if __name__ == '__main__':
     parser.add_argument("-t", "--threat", type=int, help="The threat level ID of the newly created event, if applicable. [1-4]")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     event = MISPEvent()
     event.distribution = args.distrib

{pymisp-2.5.10 → pymisp-2.5.12}/examples/cytomic_orion.py

@@ -16,7 +16,7 @@ Fetches the configuration set in the Cytomic Orion enrichment module
 
 '''
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import os
@@ -519,7 +519,7 @@ if __name__ == '__main__':
 
     module_config = get_config(misp_url, misp_key, misp_verifycert)
     cytomicobj = cytomicobject
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=cytomicobject.debug)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert, debug=cytomicobject.debug)
 
     cytomicobj.misp = misp
     cytomicobj.args = args

{pymisp-2.5.10 → pymisp-2.5.12}/examples/del.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -13,7 +13,7 @@ if __name__ == '__main__':
 
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     if args.event:
         result = misp.delete_event(args.event)

{pymisp-2.5.10 → pymisp-2.5.12}/examples/delete_user.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -11,6 +11,6 @@ if __name__ == '__main__':
     parser.add_argument("-i", "--user_id", help="The id of the user you want to delete.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     print(misp.delete_user(args.user_id))

{pymisp-2.5.10 → pymisp-2.5.12}/examples/edit_organisation.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPOrganisation
+from pymisp import PyMISP, MISPOrganisation
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -11,7 +11,7 @@ if __name__ == '__main__':
     parser.add_argument("-e", "--email", help="Email linked to the organisation.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     org = MISPOrganisation()
     org.id = args.organisation_id

{pymisp-2.5.10 → pymisp-2.5.12}/examples/edit_user.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPUser
+from pymisp import PyMISP, MISPUser
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -12,7 +12,7 @@ if __name__ == '__main__':
     parser.add_argument("-e", "--email", help="Email linked to the account.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
     user = MISPUser
     user.id = args.user_id
     user.email = args.email

{pymisp-2.5.10 → pymisp-2.5.12}/examples/falsepositive_disabletoids.py

@@ -11,7 +11,7 @@ Do inline config in "main"
 
 '''
 
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from keys import misp_url, misp_key, misp_verifycert
 from datetime import datetime
 from datetime import date
@@ -30,7 +30,7 @@ def init(url, key, verifycert):
     '''
         Template to get MISP module started
     '''
-    return ExpandedPyMISP(url, key, verifycert, 'json')
+    return PyMISP(url, key, verifycert, 'json')
 
 
 if __name__ == '__main__':

{pymisp-2.5.10 → pymisp-2.5.12}/examples/fetch_events_feed.py

@@ -3,7 +3,7 @@
 
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 
 
 if __name__ == '__main__':
@@ -11,5 +11,5 @@ if __name__ == '__main__':
     parser.add_argument("-f", "--feed", required=True, help="feed's ID to be fetched.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
     misp.fetch_feed(args.feed)

{pymisp-2.5.10 → pymisp-2.5.12}/examples/freetext.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 

{pymisp-2.5.10 → pymisp-2.5.12}/examples/get.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import os
@@ -27,7 +27,7 @@ if __name__ == '__main__':
         print('Output file already exists, abort.')
         exit(0)
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, proxies=proxies)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert, proxies=proxies)
 
     event = misp.get_event(args.event, pythonify=True)
     if args.output:

{pymisp-2.5.10 → pymisp-2.5.12}/examples/get_csv.py

@@ -3,7 +3,7 @@
 
 import argparse
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 
 
@@ -18,7 +18,7 @@ if __name__ == '__main__':
     parser.add_argument("-f", "--outfile", help="Output file to write the CSV.")
 
     args = parser.parse_args()
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
     attr = []
     if args.attribute:
         attr += args.attribute

{pymisp-2.5.10 → pymisp-2.5.12}/examples/last.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 try:
     from keys import misp_client_cert
@@ -32,7 +32,7 @@ if __name__ == '__main__':
     else:
         misp_client_cert = (misp_client_cert)
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, cert=misp_client_cert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert, cert=misp_client_cert)
     result = misp.search(publish_timestamp=args.last, limit=args.limit, page=args.page, pythonify=True)
 
     if not result:

{pymisp-2.5.10 → pymisp-2.5.12}/examples/proofpoint_tap.py

@@ -1,7 +1,7 @@
 import requests
 from requests.auth import HTTPBasicAuth
 import json
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from keys import misp_url, misp_key, misp_verifycert, proofpoint_sp, proofpoint_secret
 import urllib3
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -11,7 +11,7 @@ if proofpoint_secret == '<proofpoint secret>':
     quit()
 
 # initialize PyMISP and set url for Panorama
-misp = ExpandedPyMISP(url=misp_url, key=misp_key, ssl=misp_verifycert)
+misp = PyMISP(url=misp_url, key=misp_key, ssl=misp_verifycert)
 
 urlSiem = "https://tap-api-v2.proofpoint.com/v2/siem/all"
 

{pymisp-2.5.10 → pymisp-2.5.12}/examples/proofpoint_vap.py

@@ -1,10 +1,10 @@
 import requests
 import json
-from pymisp import ExpandedPyMISP, MISPEvent, MISPOrganisation
+from pymisp import PyMISP, MISPEvent, MISPOrganisation
 from keys import misp_url, misp_key, misp_verifycert, proofpoint_key
 
 # initialize PyMISP and set url for Panorama
-misp = ExpandedPyMISP(url=misp_url, key=misp_key, ssl=misp_verifycert)
+misp = PyMISP(url=misp_url, key=misp_key, ssl=misp_verifycert)
 
 urlVap = "https://tap-api-v2.proofpoint.com/v2/people/vap?window=30"  # Window can be 14, 30, and 90 Days
 

{pymisp-2.5.10 → pymisp-2.5.12}/examples/sharing_groups.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -9,7 +9,7 @@ import argparse
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Get a list of the sharing groups from the MISP instance.')
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     sharing_groups = misp.sharing_groups(pythonify=True)
     print(sharing_groups)

{pymisp-2.5.10 → pymisp-2.5.12}/examples/show_sightings.py

@@ -10,7 +10,7 @@ Put this script in crontab to run every day
 
 '''
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 
 import sys
@@ -29,7 +29,7 @@ def init(url, key, verifycert):
     '''
         Template to get MISP module started
     '''
-    return ExpandedPyMISP(url, key, verifycert, 'json')
+    return PyMISP(url, key, verifycert, 'json')
 
 
 def set_drift_timestamp(drift_timestamp, drift_timestamp_path):

{pymisp-2.5.10 → pymisp-2.5.12}/examples/stats_report.py

@@ -12,7 +12,7 @@ Do inline config in "main"
 
 '''
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import os
@@ -36,7 +36,7 @@ def init(url, key, verifycert):
     '''
         Template to get MISP module started
     '''
-    return ExpandedPyMISP(url, key, verifycert, 'json')
+    return PyMISP(url, key, verifycert, 'json')
 
 
 def get_data(misp, timeframe, date_from=None, date_to=None):

{pymisp-2.5.10 → pymisp-2.5.12}/examples/tags.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import json
@@ -18,7 +18,7 @@ if __name__ == '__main__':
 
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     tags = misp.tags(pythonify=True)
     for tag in tags:

{pymisp-2.5.10 → pymisp-2.5.12}/examples/up.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -13,7 +13,7 @@ if __name__ == '__main__':
 
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     me = MISPEvent()
     me.load_file(args.input)

{pymisp-2.5.10 → pymisp-2.5.12}/examples/upload.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPEvent, MISPAttribute
+from pymisp import PyMISP, MISPEvent, MISPAttribute
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 from pathlib import Path
@@ -17,7 +17,7 @@ if __name__ == '__main__':
     parser.add_argument("-i", "--info", help="Used to populate the event info field if no event ID supplied.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     files = []
     p = Path(args.upload)

{pymisp-2.5.10 → pymisp-2.5.12}/examples/users_list.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -9,7 +9,7 @@ import argparse
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Get a list of the sharing groups from the MISP instance.')
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     users_list = misp.users(pythonify=True)
     print(users_list)

{pymisp-2.5.10 → pymisp-2.5.12}/examples/vmray_automation.py

@@ -37,7 +37,7 @@ from typing import Any, Dict, List, Optional
 import requests
 
 from keys import misp_key, misp_url, misp_verifycert
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 
 # Suppress those "Unverified HTTPS request is being made"
 import urllib3
@@ -75,7 +75,7 @@ class VMRayAutomation:
         self.misp_url = misp_url.rstrip("/")
         self.misp_key = misp_key
         self.verifycert = verify_cert
-        self.misp = ExpandedPyMISP(misp_url, misp_key, ssl=verify_cert, debug=debug)
+        self.misp = PyMISP(misp_url, misp_key, ssl=verify_cert, debug=debug)
         self.config = {}
         self.tag_incomplete = 'workflow:state="incomplete"'