Provide remote Pyro5 compatibility as well

intra2net · Nov 13, 2024 · fc518f2 · fc518f2
1 parent 9c07390
commit fc518f2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/aexpect/remote_door.py b/aexpect/remote_door.py
@@ -77,6 +77,7 @@
         from Pyro5 import server
         # noinspection PyPackageRequirements
         from Pyro5 import nameserver
+        ns_module = "Pyro5.nameserver"
     except ImportError:
         # noinspection PyPackageRequirements,PyUnresolvedReferences
         import Pyro4
@@ -92,6 +93,7 @@ def __init__(self):
         # noinspection PyPackageRequirements
         from Pyro4 import naming as nameserver
         nameserver.start_ns = nameserver.startNS
+        ns_module = "Pyro4.naming"
 
 except ImportError:
     logging.warning("Remote object backend (Pyro4) not found, some functionality"
@@ -848,7 +850,7 @@ def share_remote_objects(session, control_path, host="localhost", port=9090,
 
     # setup remote objects server
     LOG.info("Starting nameserver for the remote objects")
-    cmd = f"python -m Pyro4.naming -n {host} -p {port}"
+    cmd = f"python -m {ns_module} -n {host} -p {port}"
     session.cmd("START " + cmd if os_type == "windows" else cmd + " &")
 
     LOG.info("Starting the server daemon for the remote objects")