refactor: clean up jpype imports in stubgen test and main module

Author: tlambert03

src/scyjava/_stubs/_genstubs.py

@@ -8,10 +8,13 @@
 from importlib import import_module
 from itertools import chain
 from pathlib import Path, PurePath
+import sys
 from typing import TYPE_CHECKING, Any
 from unittest.mock import patch
 from zipfile import ZipFile
 
+import jpype
+
 import scyjava
 import scyjava.config
 import stubgenj
@@ -70,11 +73,6 @@ def generate_stubs(
     """
     import jpype
 
-    # FIXME: either remove the _JImportLoader from sys.meta_path after this is done
-    # (if it wasn't there to begin with), or replace the import_module calls below
-    # with a more direct JPackage call
-    import jpype.imports
-
     startJVM = jpype.startJVM
 
     scyjava.config.endpoints.extend(endpoints)
@@ -99,7 +97,16 @@ def _patched_start(*args: Any, **kwargs: Any) -> None:
     logger.info(f"Generating stubs for: {prefixes}")
     logger.info(f"Writing stubs to: {output_dir}")
 
-    jmodules = [import_module(prefix) for prefix in prefixes]
+    metapath = sys.meta_path
+    try:
+        import jpype.imports
+
+        jmodules = [import_module(prefix) for prefix in prefixes]
+    finally:
+        # remove the jpype.imports magic from the import system
+        # if it wasn't there to begin with
+        sys.meta_path = metapath
+
     stubgenj.generateJavaStubs(
         jmodules,
         useStubsSuffix=False,

tests/test_stubgen.py

@@ -5,7 +5,6 @@
 from unittest.mock import patch
 
 import jpype
-import jpype.imports
 
 import scyjava
 from scyjava._stubs import _cli