diff options
| author |   Michael S. Pedersen <michael.soelvkaer@gmail.com> | 2019-12-03 11:38:32 +0000 |
|---|---|---|
| committer | Michael S. Pedersen <michael.soelvkaer@gmail.com> | 2019-12-09 22:07:08 +0000 |
| commit | 95f2491ed89ac99b0d8bd006b4a13cbeb1eb96ce (patch) | |
| tree | 8d2d8cd00f3284036e9bf78d9ec9bfdb3e95c80b /nfvbench/cleanup.py | |
| parent | 24314713446b6411cedce4329ab5ebfd6da678a2 (diff) | |
NFVBENCH-153 Add support for python34.0.0
JIRA: NFVBENCH-153
Done using 2to3-3.6 with additional changes to fix data parsing and
testing (tox)
Signed-off-by: Michael S. Pedersen <michael.soelvkaer@gmail.com>
Change-Id: I242902f800da543d780507828c9bd1fbf409da6d
Diffstat (limited to 'nfvbench/cleanup.py')
| -rw-r--r-- | nfvbench/cleanup.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nfvbench/cleanup.py b/nfvbench/cleanup.py index 6a79a63..22ed3c1 100644 --- a/nfvbench/cleanup.py +++ b/nfvbench/cleanup.py @@ -22,8 +22,8 @@ from novaclient.client import Client from novaclient.exceptions import NotFound from tabulate import tabulate -import credentials as credentials -from log import LOG +from . import credentials +from .log import LOG class ComputeCleaner(object): @@ -300,20 +300,20 @@ class Cleaner(object): LOG.info("NFVbench will delete resources shown...") clean_options = None if prompt: - answer = raw_input("Do you want to delete all ressources? (y/n) ") + answer = input("Do you want to delete all ressources? (y/n) ") if answer.lower() != 'y': - print "What kind of resources do you want to delete?" + print("What kind of resources do you want to delete?") all_option = "" all_option_codes = [] for cleaner in self.cleaners: code = cleaner.get_cleaner_code() - print "%s: %s" % (code[0], code) + print(("%s: %s" % (code[0], code))) all_option += code[0] all_option_codes.append(code) - print "a: all resources - a shortcut for '%s'" % all_option + print(("a: all resources - a shortcut for '%s'" % all_option)) all_option_codes.append("all resources") - print "q: quit" - answer_res = raw_input(":").lower() + print("q: quit") + answer_res = input(":").lower() # Check only first character because answer_res can be "flavor" and it is != all if answer_res[0] == "a": clean_options = all_option |