epicknex/hererocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pyflakes and pep8 fixes; python 2.7 compatibility

Browse Source 
Yay... Python 2.7 does not support `def f(*args, shell=True)`.
Workaround by using **kwargs.
This commit is contained in:
Peter Wu 2016-03-27 13:08:47 +02:00
parent 7af7d9c7be
commit b25cc45dbc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hererocks.py
View File

@ -76,7 +76,8 @@ def get_default_cache():
def quote(command_arg): def quote(command_arg):
return "'" + command_arg.replace("'", "'\"'\"'") + "'" return "'" + command_arg.replace("'", "'\"'\"'") + "'"
def exec_command(capture, *args, shell=True): def exec_command(capture, *args, **kwargs):
shell = kwargs.get("shell", True)
command = " ".join(args) if shell else args command = " ".join(args) if shell else args
if opts.verbose: if opts.verbose:
@ -103,8 +104,8 @@ def exec_command(capture, *args, shell=True):
return capture and output.decode("UTF-8") return capture and output.decode("UTF-8")
def run_command(*args, shell=True): def run_command(*args, **kwargs):
exec_command(False, *args, shell=True) exec_command(False, *args, **kwargs)
def copy_dir(src, dst): def copy_dir(src, dst):
shutil.copytree(src, dst, ignore=lambda _, __: {".git"}) shutil.copytree(src, dst, ignore=lambda _, __: {".git"})
@ -849,7 +850,7 @@ class LuaRocks(Program):
lua_binary = os.path.join(opts.location, "bin", exe(lua)) lua_binary = os.path.join(opts.location, "bin", exe(lua))
if is_executable(lua_binary): if is_executable(lua_binary):
return exec_command(True, lua_binary, "-e", return exec_command(True, lua_binary, "-e",
"print(_VERSION:sub(5))", shell=False).strip() "print(_VERSION:sub(5))", shell=False).strip()
raise "Could not locate the LUA binary!" raise "Could not locate the LUA binary!"
def luarocks_help(self): def luarocks_help(self):