diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-05-04 16:06:20 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-14 07:26:42 +0100 |
commit | eb87d591ef67f1953b2689430ef6c5a6a27a5b6e (patch) | |
tree | 266c14927ee0c6c12f91dc6efee899f4fc43898d /scripts/lib/wic | |
parent | 15e88714d6b0a93f72e8a19b083fcc1f2006e128 (diff) | |
download | openembedded-core-eb87d591ef67f1953b2689430ef6c5a6a27a5b6e.tar.gz openembedded-core-eb87d591ef67f1953b2689430ef6c5a6a27a5b6e.tar.bz2 openembedded-core-eb87d591ef67f1953b2689430ef6c5a6a27a5b6e.zip |
wic: remove unused functions
Removed 'raw', 'ask', 'choice' and 'pause' functions from
msger.py as they're not used in wic code and some of them
use raw_input, which is not present in Python 3.
[YOCTO #9412]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic')
-rw-r--r-- | scripts/lib/wic/msger.py | 69 |
1 files changed, 1 insertions, 68 deletions
diff --git a/scripts/lib/wic/msger.py b/scripts/lib/wic/msger.py index b737554228..2340ac2f10 100644 --- a/scripts/lib/wic/msger.py +++ b/scripts/lib/wic/msger.py @@ -21,18 +21,14 @@ import sys import re import time -__ALL__ = ['set_mode', - 'get_loglevel', +__ALL__ = ['get_loglevel', 'set_loglevel', 'set_logfile', - 'raw', 'debug', 'verbose', 'info', 'warning', 'error', - 'ask', - 'pause', ] # COLORs in ANSI @@ -182,9 +178,6 @@ def log(msg=''): if msg: LOG_CONTENT += msg -def raw(msg=''): - _general_print('', NO_COLOR, msg) - def info(msg): head, msg = _split_msg('Info', msg) _general_print(head, INFO_COLOR, msg) @@ -206,66 +199,6 @@ def error(msg): _color_perror(head, ERR_COLOR, msg) sys.exit(1) -def ask(msg, default=True): - _general_print('\rQ', ASK_COLOR, '') - try: - if default: - msg += '(Y/n) ' - else: - msg += '(y/N) ' - if INTERACTIVE: - while True: - repl = raw_input(msg) - if repl.lower() == 'y': - return True - elif repl.lower() == 'n': - return False - elif not repl.strip(): - # <Enter> - return default - - # else loop - else: - if default: - msg += ' Y' - else: - msg += ' N' - _general_print('', NO_COLOR, msg) - - return default - except KeyboardInterrupt: - sys.stdout.write('\n') - sys.exit(2) - -def choice(msg, choices, default=0): - if default >= len(choices): - return None - _general_print('\rQ', ASK_COLOR, '') - try: - msg += " [%s] " % '/'.join(choices) - if INTERACTIVE: - while True: - repl = raw_input(msg) - if repl in choices: - return repl - elif not repl.strip(): - return choices[default] - else: - msg += choices[default] - _general_print('', NO_COLOR, msg) - - return choices[default] - except KeyboardInterrupt: - sys.stdout.write('\n') - sys.exit(2) - -def pause(msg=None): - if INTERACTIVE: - _general_print('\rQ', ASK_COLOR, '') - if msg is None: - msg = 'press <ENTER> to continue ...' - raw_input(msg) - def set_logfile(fpath): global LOG_FILE_FP |