Remove a few more Python 2-compatibility workarounds
This commit is contained in:
@@ -60,12 +60,8 @@ def evaluate_word_node(node, context):
|
|||||||
def evaluate_command_node(node, context):
|
def evaluate_command_node(node, context):
|
||||||
words = [evaluate_node(part, context=context) for part in node.parts]
|
words = [evaluate_node(part, context=context) for part in node.parts]
|
||||||
command = ' '.join(words)
|
command = ' '.join(words)
|
||||||
output = subprocess.check_output(shlex.split(command), env=context.environment)
|
return subprocess.check_output(shlex.split(command), env=context.environment, universal_newlines=True)
|
||||||
|
|
||||||
if sys.version_info[0] >= 3:
|
|
||||||
return output.decode('utf8', 'replace')
|
|
||||||
else:
|
|
||||||
return output
|
|
||||||
|
|
||||||
def evaluate_parameter_node(node, context):
|
def evaluate_parameter_node(node, context):
|
||||||
return context.environment.get(node.value, '')
|
return context.environment.get(node.value, '')
|
||||||
|
|||||||
@@ -32,9 +32,7 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
|
|||||||
get_pip_url = 'https://bootstrap.pypa.io/get-pip.py'
|
get_pip_url = 'https://bootstrap.pypa.io/get-pip.py'
|
||||||
get_pip_script = '/tmp/get-pip.py'
|
get_pip_script = '/tmp/get-pip.py'
|
||||||
|
|
||||||
pkgs_output = subprocess.check_output(['pkgutil', '--pkgs'])
|
pkgs_output = subprocess.check_output(['pkgutil', '--pkgs'], universal_newlines=True)
|
||||||
if sys.version_info[0] >= 3:
|
|
||||||
pkgs_output = pkgs_output.decode('utf8')
|
|
||||||
installed_system_packages = pkgs_output.splitlines()
|
installed_system_packages = pkgs_output.splitlines()
|
||||||
|
|
||||||
def call(args, env=None, cwd=None, shell=False):
|
def call(args, env=None, cwd=None, shell=False):
|
||||||
|
|||||||
Reference in New Issue
Block a user