diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | python/__init__.py | 10 | ||||
| -rw-r--r-- | python/decorators.py | 2 | ||||
| -rw-r--r-- | python/enterprise.py | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 96870fe2..63fb2d4e 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB PYTHON_SOURCES CONFIGURE_DEPENDS list(REMOVE_ITEM PYTHON_SOURCES ${PROJECT_SOURCE_DIR}/_binaryninjacore.py) list(REMOVE_ITEM PYTHON_SOURCES ${PROJECT_SOURCE_DIR}/enums.py) -if(NOT ENTERPRISE) +if(NOT ULTIMATE) list(REMOVE_ITEM PYTHON_SOURCES ${PROJECT_SOURCE_DIR}/enterprise.py) list(FILTER PYTHON_SOURCES EXCLUDE REGEX ".*/collaboration/.*$") endif() diff --git a/python/__init__.py b/python/__init__.py index 93ddb72c..84494296 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -92,8 +92,8 @@ import warnings # https://docs.python.org/3/library/warnings.html#default-warning-filter warnings.filterwarnings('once', '', DeprecatedWarning) -# Only load Enterprise Client support on Enterprise builds -if core.BNGetProduct() == "Binary Ninja Enterprise Client": +# Only load Enterprise Client support on Ultimate builds +if core.BNGetProduct() == "Binary Ninja Enterprise Client" or core.BNGetProduct() == "Binary Ninja Ultimate": from .enterprise import * @@ -235,8 +235,8 @@ def _init_plugins(): global _enterprise_license_checkout if not _plugin_init: - if not core_ui_enabled() and core.BNGetProduct() == "Binary Ninja Enterprise Client": - # Enterprise client needs to checkout a license reservation or else BNInitPlugins will fail + if not core_ui_enabled() and (core.BNGetProduct() == "Binary Ninja Enterprise Client" or core.BNGetProduct() == "Binary Ninja Ultimate"): + # Enterprise client needs to reserve a license or else BNInitPlugins will fail _enterprise_license_checkout = enterprise.LicenseCheckout() _enterprise_license_checkout.acquire() @@ -484,7 +484,7 @@ def fuzzy_match_single(target, query) -> Optional[int]: return result -# Load Collaboration scripts from Enterprise (they are bundled in shipping builds) +# Load Collaboration scripts from Ultimate (they are bundled in shipping builds) try: from . import collaboration except ImportError: diff --git a/python/decorators.py b/python/decorators.py index 6ac77be0..f9bf47bf 100644 --- a/python/decorators.py +++ b/python/decorators.py @@ -14,7 +14,7 @@ def passive(cls): def enterprise(cls): enterprise_note = ''' - .. note: This object is only available in the Enterprise edition of Binary Ninja. + .. note: This object is only available in the Ultimate edition of Binary Ninja. ''' if hasattr(cls, "__doc__") and cls.__doc__: diff --git a/python/enterprise.py b/python/enterprise.py index 65fd31be..03846a17 100644 --- a/python/enterprise.py +++ b/python/enterprise.py @@ -1,5 +1,5 @@ """ -.. note: This module is only available in the Enterprise edition of Binary Ninja. +.. note: This module is only available in the Ultimate edition of Binary Ninja. """ import ctypes @@ -13,9 +13,9 @@ import binaryninja from . import decorators from . import deprecation -if core.BNGetProduct() != "Binary Ninja Enterprise Client": +if core.BNGetProduct() != "Binary Ninja Enterprise Client" and core.BNGetProduct() != "Binary Ninja Ultimate": # None of these functions exist on other builds, so just raise here to notify anyone who tries to use this - raise RuntimeError("Cannot use Binary Ninja Enterprise client functionality with a non-Enterprise client.") + raise RuntimeError("Binary Ninja Enterprise client functionality requires the Binary Ninja Ultimate edition.") def is_initialized() -> bool: |