From 74cc4d4da825a4ac5b1f30406d3f1f3895f309b5 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Mon, 4 May 2020 15:00:53 +0200 Subject: [PATCH] Remove future dependency Stop importing print function from future. Change-Id: I5c40446e14ccd9a2fe3b673c8bc8581c64012899 --- ironicclient/common/utils.py | 2 -- tools/install_venv_common.py | 10 ++++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ironicclient/common/utils.py b/ironicclient/common/utils.py index cf3b1bad9..d8402effe 100644 --- a/ironicclient/common/utils.py +++ b/ironicclient/common/utils.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import print_function - import argparse import contextlib import gzip diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index b0bada126..5fd4aa013 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -17,13 +17,11 @@ virtual environments. Since this script is used to bootstrap a virtualenv from the system's Python -environment, it should be kept strictly compatible with Python 2.7. +environment, it should be kept strictly compatible with Python 3.6. Synced in from openstack-common """ -from __future__ import print_function - import optparse import os import subprocess @@ -47,8 +45,8 @@ class InstallVenv(object): sys.exit(1) def check_python_version(self): - if sys.version_info < (2, 7): - self.die("Need Python Version >= 2.7") + if sys.version_info < (3, 6): + self.die("Need Python Version >= 3.6") def run_command_with_code(self, cmd, redirect_output=True, check_exit_code=True): @@ -65,7 +63,7 @@ class InstallVenv(object): output = proc.communicate()[0] if check_exit_code and proc.returncode != 0: self.die('Command "%s" failed.\n%s', ' '.join(cmd), output) - return (output, proc.returncode) + return output, proc.returncode def run_command(self, cmd, redirect_output=True, check_exit_code=True): return self.run_command_with_code(cmd, redirect_output,