From a44d80f88e22eda24dacef48e368895ebea96635 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Wed, 28 Aug 2019 01:19:30 -0700 Subject: Adjusted subprocess.run() calls to use arg list, rather than string. The Python docs recommend passing a sequence to subprocess.run() when possible. Doing so allows for automatic escaping and quoting of arguments. https://docs.python.org/3/library/subprocess.html#frequently-used-arguments > args is required for all calls and should be a string, or a sequence > of program arguments. Providing a sequence of arguments is generally > preferred, as it allows the module to take care of any required > escaping and quoting of arguments (e.g. to permit spaces in file > names). Also removed `shell=True` where unnecessary. --- scripts/manage_translations.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/manage_translations.py b/scripts/manage_translations.py index 1eb1635822..bf4cb79ad1 100644 --- a/scripts/manage_translations.py +++ b/scripts/manage_translations.py @@ -144,12 +144,11 @@ def fetch(resources=None, languages=None): for name, dir_ in locale_dirs: # Transifex pull if languages is None: - run('tx pull -r %(res)s -a -f --minimum-perc=5' % {'res': _tx_resource_for_name(name)}, shell=True) + run(['tx', 'pull', '-r', _tx_resource_for_name(name), '-a', '-f', '--minimum-perc=5']) target_langs = sorted(d for d in os.listdir(dir_) if not d.startswith('_') and d != 'en') else: for lang in languages: - run('tx pull -r %(res)s -f -l %(lang)s' % { - 'res': _tx_resource_for_name(name), 'lang': lang}, shell=True) + run(['tx', 'pull', '-r', _tx_resource_for_name(name), '-f', '-l', lang]) target_langs = languages # msgcat to wrap lines and msgfmt for compilation of .mo file @@ -160,8 +159,8 @@ def fetch(resources=None, languages=None): print("No %(lang)s translation for resource %(name)s" % { 'lang': lang, 'name': name}) continue - run('msgcat --no-location -o %s %s' % (po_path, po_path), shell=True) - msgfmt = run('msgfmt -c -o %s.mo %s' % (po_path[:-3], po_path), shell=True) + run(['msgcat', '--no-location', '-o', po_path, po_path]) + msgfmt = run(['msgfmt', '-c', '-o', '%s.mo' % po_path[:-3], po_path]) if msgfmt.returncode != 0: errors.append((name, lang)) if errors: -- cgit v1.3