From cede41ecf8990e2d9d24da25dd2c29d92c6857cc Mon Sep 17 00:00:00 2001 From: Don Penney Date: Fri, 31 Aug 2018 15:31:30 +0000 Subject: [PATCH] Revert "Fix raw_input issue for Python 2/3 compatible code." This reverts commit 2d1e3b7981ff7b4ff8619a71d6dd569526d99c0e. This update causes an import failure for the sw-patch CLI command, as the "builtins" module is not currently part of the load. Change-Id: I9f71f001dd36ccd769b888fbf45cba105e7bcde2 Closes-bug: 1790166 --- cgcs-patch/cgcs-patch/cgcs_patch/patch_client.py | 3 +-- tox.ini | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_client.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_client.py index 940304e5..d4cdba44 100644 --- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_client.py +++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_client.py @@ -5,7 +5,6 @@ SPDX-License-Identifier: Apache-2.0 """ -from builtins import input import requests import json import os @@ -601,7 +600,7 @@ def patch_commit_req(debug, args): print textwrap.fill(commit_warning, width=TERM_WIDTH, subsequent_indent=' ' * 9) print - user_input = input("Would you like to continue? [y/N]: ") + user_input = raw_input("Would you like to continue? [y/N]: ") if user_input.lower() != 'y': print "Aborting..." return 1 diff --git a/tox.ini b/tox.ini index 50076a37..0188d675 100644 --- a/tox.ini +++ b/tox.ini @@ -100,7 +100,6 @@ deps = {[testenv]deps} requests requests_toolbelt rpm - future basepython = python2.7 commands = pylint {[testenv]cgcs_patch_src_dir} \ {[testenv]patch_alarm_src_dir} \