From e8d121552c9a23e87f35369aba79563f72b3bba1 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Mon, 3 Feb 2020 20:11:00 +0100 Subject: [PATCH] Remove a few more Python 2-compatibility workarounds --- cibuildwheel/bashlex_eval.py | 6 +----- cibuildwheel/macos.py | 4 +--- setup.py | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cibuildwheel/bashlex_eval.py b/cibuildwheel/bashlex_eval.py index af1ef5ba..1caddd8f 100644 --- a/cibuildwheel/bashlex_eval.py +++ b/cibuildwheel/bashlex_eval.py @@ -60,12 +60,8 @@ def evaluate_word_node(node, context): def evaluate_command_node(node, context): words = [evaluate_node(part, context=context) for part in node.parts] 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): return context.environment.get(node.value, '') diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 6e71d673..a649ac91 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -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_script = '/tmp/get-pip.py' - pkgs_output = subprocess.check_output(['pkgutil', '--pkgs']) - if sys.version_info[0] >= 3: - pkgs_output = pkgs_output.decode('utf8') + pkgs_output = subprocess.check_output(['pkgutil', '--pkgs'], universal_newlines=True) installed_system_packages = pkgs_output.splitlines() def call(args, env=None, cwd=None, shell=False): diff --git a/setup.py b/setup.py index 89537bdf..bb6db2ca 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- import os, io