update cmd.py

linuxdeepin · Aug 19, 2024 · 511f089 · 511f089
1 parent f80c529
commit 511f089
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/youqu3/cmd.py b/youqu3/cmd.py
@@ -97,12 +97,16 @@ def expect_run(
         如果 return_code=True，返回 (stdout, return_code)
         """
         import pexpect
-        return pexpect.run(
+        res = pexpect.run(
             cmd,
             events=events,
             withexitstatus=return_code,
             timeout=timeout
         )
+        if return_code is False:
+            return res.decode("utf-8")
+        stdout, return_code = res
+        return stdout.decode("utf-8"), return_code
 
     @classmethod
     def sudo_run(
@@ -133,10 +137,9 @@ def sudo_run(
         )
         if return_code is False:
             return res.lstrip("请输入密码●")
-        else:
-            res = list(res)
-            res[0] = res[0].lstrip("请输入密码●")
-            return res
+        res = list(res)
+        res[0] = res[0].lstrip("请输入密码●")
+        return res
 
 
 class RemoteCmd:
@@ -153,10 +156,7 @@ def remote_run(self, cmd: str, return_code: bool = False, timeout: int = None):
             return_code=return_code,
             timeout=timeout
         )
-        if return_code is False:
-            return res.decode("utf-8")
-        stdout, return_code = res
-        return stdout.decode("utf-8"), return_code
+        return res
 
     def remote_sudo_run(self, cmd: str, workdir: str = None, return_code: bool = False):
         wd = ""