masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed checks for command attribute in run_through_shell and execute.

Browse Source
This commit is contained in:
Lukáš Mandák 2015-10-03 10:14:29 +02:00
parent 2ef74ded79
commit 081bd329f9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
i3pystatus/core/command.py
View File

@ -25,13 +25,14 @@ def run_through_shell(command, enable_shell=False):
string since shell does all the parsing. string since shell does all the parsing.
""" """
if not enable_shell and not isinstance(command, list): if not enable_shell and isinstance(command, str):
command = shlex.split(command) command = shlex.split(command)
returncode = None returncode = None
stderr = None stderr = None
try: try:
proc = subprocess.Popen(command, stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=enable_shell) proc = subprocess.Popen(command, stderr=subprocess.PIPE,
stdout=subprocess.PIPE, shell=enable_shell)
out, stderr = proc.communicate() out, stderr = proc.communicate()
out = out.decode("UTF-8") out = out.decode("UTF-8")
stderr = stderr.decode("UTF-8") stderr = stderr.decode("UTF-8")
@ -64,10 +65,13 @@ def execute(command, detach=False):
if detach: if detach:
if not isinstance(command, str): if not isinstance(command, str):
raise TypeError("Detached mode expects a string as command.") msg = "Detached mode expects a string as command, not {}".format(
command)
logging.getLogger("i3pystatus.core.command").error(msg)
raise AttributeError(msg)
command = ["i3-msg", "exec", command] command = ["i3-msg", "exec", command]
else: else:
if not isinstance(command, list): if isinstance(command, str):
command = shlex.split(command) command = shlex.split(command)
try: try: