Revert "Fix raw_input issue for Python 2/3 compatible code."
This reverts commit 2d1e3b7981
.
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
This commit is contained in:
parent
2d1e3b7981
commit
cede41ecf8
|
@ -5,7 +5,6 @@ SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from builtins import input
|
|
||||||
import requests
|
import requests
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
@ -601,7 +600,7 @@ def patch_commit_req(debug, args):
|
||||||
print textwrap.fill(commit_warning, width=TERM_WIDTH, subsequent_indent=' ' * 9)
|
print textwrap.fill(commit_warning, width=TERM_WIDTH, subsequent_indent=' ' * 9)
|
||||||
print
|
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':
|
if user_input.lower() != 'y':
|
||||||
print "Aborting..."
|
print "Aborting..."
|
||||||
return 1
|
return 1
|
||||||
|
|
1
tox.ini
1
tox.ini
|
@ -100,7 +100,6 @@ deps = {[testenv]deps}
|
||||||
requests
|
requests
|
||||||
requests_toolbelt
|
requests_toolbelt
|
||||||
rpm
|
rpm
|
||||||
future
|
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
commands = pylint {[testenv]cgcs_patch_src_dir} \
|
commands = pylint {[testenv]cgcs_patch_src_dir} \
|
||||||
{[testenv]patch_alarm_src_dir} \
|
{[testenv]patch_alarm_src_dir} \
|
||||||
|
|
Loading…
Reference in New Issue