[SSH] Remove CTYPES dependency (#7765)

Azure · Jul 19, 2024 · 852fdaf · 852fdaf
1 parent 085f640
commit 852fdaf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 116 deletions.
diff --git a/src/ssh/HISTORY.md b/src/ssh/HISTORY.md
@@ -1,5 +1,9 @@
 Release History
 ===============
+2.0.5
+-----
+* Remove ctypes dependency from RDP feature
+
 2.0.4
 -----
 * Install Arc SSH Proxy from MAR

diff --git a/src/ssh/azext_ssh/_process_helper.py b/src/ssh/azext_ssh/_process_helper.py
diff --git a/src/ssh/azext_ssh/rdp_utils.py b/src/ssh/azext_ssh/rdp_utils.py
@@ -82,12 +82,13 @@ def start_rdp_connection(ssh_info, delete_keys, delete_cert):
 
 
 def call_rdp(local_port):
-    from . import _process_helper
     if platform.system() == 'Windows':
         print_styled_text((Style.SUCCESS, "Launching Remote Desktop Connection"))
         print_styled_text((Style.IMPORTANT, "To close this session, close the Remote Desktop Connection window."))
         command = [_get_rdp_path(), f"/v:localhost:{local_port}"]
-        _process_helper.launch_and_wait(command)
+        process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        # process.wait() doesn't work correctly when 32bit python is installed on 64bit machines
+        _ = process.communicate()
 
 
 def is_local_port_open(local_port):

diff --git a/src/ssh/setup.py b/src/ssh/setup.py
@@ -7,7 +7,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "2.0.4"
+VERSION = "2.0.5"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',