[util] vendor_hw.py use python 3.5 compatible subprocess args
System requirements section of OpenTitan says following:
Python 3.5.2 or newer. Python 3.6+ is recommended.
Python subprocess enconding argument has been added in python version
3.6, and is not compatible with the earlier versions. In order to keep
compatibility, all relevant occurences of encoding argument are
substituted for universal_newlines. The effect is the same - forcing
stdin, stdout and stderr to be opened in text mode.
Signed-off-by: Silvestrs Timofejevs <silvestrst@lowrisc.org>
diff --git a/util/vendor_hw.py b/util/vendor_hw.py
index f43355b..b5f0002 100755
--- a/util/vendor_hw.py
+++ b/util/vendor_hw.py
@@ -157,7 +157,7 @@
check=True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
- encoding="UTF-8")
+ universal_newlines=True)
return proc.stdout.splitlines()
except subprocess.CalledProcessError as e:
log.error("Unable to capture shortlog: %s", e.stderr)
@@ -237,7 +237,7 @@
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
check=True,
- encoding='UTF-8').stdout.strip()
+ universal_newlines=True).stdout.strip()
log.info('Cloned at revision %s', rev)
return rev
@@ -249,7 +249,7 @@
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
check=True,
- encoding='UTF-8').stdout.strip()
+ universal_newlines=True).stdout.strip()
return short_rev
@@ -259,13 +259,13 @@
# Stage all changes
for p in paths:
cmd_add = ['git', '-C', str(repo_base), 'add', str(p)]
- subprocess.run(cmd_add, check=True, encoding='UTF-8')
+ subprocess.run(cmd_add, check=True)
cmd_commit = ['git', '-C', str(repo_base), 'commit', '-s', '-F', '-']
try:
subprocess.run(cmd_commit,
check=True,
- encoding='UTF-8',
+ universal_newlines=True,
input=commit_msg)
except subprocess.CalledProcessError as e:
log.warning("Unable to create commit. Are there no changes?")
