gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 21:08:06 +01:00
Code Issues Projects Releases Wiki Activity

Always use the "C" local when running external commands.

Browse Source
This commit is contained in:
Dan O'Reilly
2009-04-03 19:07:00 -04:00
parent 57f6aab60c
commit b79151ef07
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wicd/misc.py
View File

@@ -73,7 +73,6 @@ class WicdError(Exception):
pass pass
__LANG = None
def Run(cmd, include_stderr=False, return_pipe=False, def Run(cmd, include_stderr=False, return_pipe=False,
return_obj=False, return_retcode=True): return_obj=False, return_retcode=True):
""" Run a command. """ Run a command.
@@ -93,7 +92,6 @@ def Run(cmd, include_stderr=False, return_pipe=False,
for the command that was run. for the command that was run.
""" """
global __LANG
if not isinstance(cmd, list): if not isinstance(cmd, list):
cmd = to_unicode(str(cmd)) cmd = to_unicode(str(cmd))
cmd = cmd.split() cmd = cmd.split()
@@ -110,11 +108,9 @@ def Run(cmd, include_stderr=False, return_pipe=False,
# We need to make sure that the results of the command we run # We need to make sure that the results of the command we run
# are in English, so we set up a temporary environment. # are in English, so we set up a temporary environment.
if not __LANG:
__LANG = get_good_lang()
tmpenv = os.environ.copy() tmpenv = os.environ.copy()
tmpenv["LC_ALL"] = __LANG tmpenv["LC_ALL"] = "C"
tmpenv["LANG"] = __LANG tmpenv["LANG"] = "C"
try: try:
f = Popen(cmd, shell=False, stdout=PIPE, stdin=std_in, stderr=err, f = Popen(cmd, shell=False, stdout=PIPE, stdin=std_in, stderr=err,
@@ -123,7 +119,6 @@ def Run(cmd, include_stderr=False, return_pipe=False,
print "Running command %s failed: %s" % (str(cmd), str(e)) print "Running command %s failed: %s" % (str(cmd), str(e))
return "" return ""
if return_obj: if return_obj:
return f return f
if return_pipe: if return_pipe:
@@ -131,14 +126,6 @@ def Run(cmd, include_stderr=False, return_pipe=False,
else: else:
return f.communicate()[0] return f.communicate()[0]
def get_good_lang():
""" Check if en_US.utf8 is an available locale, if not use C. """
output = Popen(["locale", "-a"], shell=False, stdout=PIPE).communicate()[0]
if "en_US.utf8" in output:
return "en_US.utf8"
else:
return "C"
def LaunchAndWait(cmd): def LaunchAndWait(cmd):
""" Launches the given program with the given arguments, then blocks. """ Launches the given program with the given arguments, then blocks.
@@ -553,4 +540,3 @@ def grouper(n, iterable, fillvalue=None):
""" """
args = [iter(iterable)] * n args = [iter(iterable)] * n
return izip_longest(fillvalue=fillvalue, *args) return izip_longest(fillvalue=fillvalue, *args)