Merge remote-tracking branch 'origin/topic/timw/revert-zeekclient-imp…

…ort-path-modifications'

* origin/topic/timw/revert-zeekclient-import-path-modifications:
  Revert modification of sys.path when importing zeekclient

CHANGES

@@ -1,3 +1,7 @@
+1.3.1-49 | 2024-12-12 16:41:07 -0800
+
+  * Revert modification of sys.path when importing zeekclient (Tim Wojtulewicz, Corelight)
+
 1.3.1-47 | 2024-12-06 18:26:31 -0700
 
   * Ensure exception types in our tests match websocket-client (Tim Wojtulewicz, Corelight)

VERSION

@@ -1 +1 @@
-1.3.1-47
+1.3.1-49

zeek-client

@@ -13,9 +13,19 @@ the idioms and primitives also used by the zkg package manager.
 # https://pypi.org/project/argcomplete/#global-completion
 # PYTHON_ARGCOMPLETE_OK
 
+import os.path
 import sys
 
-import zeekclient
+# For Zeek-bundled installation, prepend the Python path of the Zeek
+# installation to the search path. This ensures we find the matching module
+# first (or at all), avoiding potential conflicts with installations elsewhere
+# on the system.
+ZEEK_PYTHON_DIR = "@PY_MOD_INSTALL_DIR@"
+if os.path.isdir(ZEEK_PYTHON_DIR):
+    sys.path.insert(0, os.path.abspath(ZEEK_PYTHON_DIR))
+else:
+    ZEEK_PYTHON_DIR = None
+import zeekclient  # pylint: disable=wrong-import-position
 
 
 def main():

zeekclient/__init__.py

@@ -24,7 +24,7 @@
 )
 from .logs import LOG
 
-__version__ = "1.3.1-47"
+__version__ = "1.3.1-49"
 __all__ = [
     "brokertypes",
     "cli",