gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-24 15:12:31 +01:00
Code Issues Projects Releases Wiki Activity

Fix bytes/string issue for subprocess

Browse Source
This commit is contained in:
gryf
2020-08-05 12:35:35 +02:00
parent f3bee99e79
commit 24117dbf81
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wicd/misc.py
View File

@@ -29,6 +29,7 @@ import re
from pipes import quote
import socket
import string
import subprocess
from subprocess import Popen, STDOUT, PIPE, call
from subprocess import getoutput
import sys
@@ -151,7 +152,8 @@ def Run(cmd, include_stderr=False, return_pipe=False,
try:
f = Popen(cmd, shell=False, stdout=PIPE, stdin=std_in, stderr=err,
close_fds=fds, cwd='/', env=tmpenv)
close_fds=fds, cwd='/', env=tmpenv,
encoding=sys.getdefaultencoding())
except OSError as e:
print(("Running command %s failed: %s" % (str(cmd), str(e))))
return ""
@@ -161,7 +163,7 @@ def Run(cmd, include_stderr=False, return_pipe=False,
if return_pipe:
return f.stdout
else:
return f.communicate()[0].decode()
return f.communicate()[0]
def LaunchAndWait(cmd):