diff options
| author | Binh Le <lebinh.it@gmail.com> | 2015-02-17 23:26:23 +0700 |
|---|---|---|
| committer | Binh Le <lebinh.it@gmail.com> | 2015-02-17 23:26:23 +0700 |
| commit | 170caa1cd899de051ab961a3e46f7ecfbfed7764 (patch) | |
| tree | cd06484995a508f5244b9fd7df6a60e444dc9d98 | |
| parent | c34fe7ee1a9c4b6dbb07191e80334a2f4517ac94 (diff) | |
| parent | dbc06a4f8621aeb42515eb4c529d0684fdae4b41 (diff) | |
Merge pull request #41 from jlec/master
Fix more python3 incompatibilities
| -rw-r--r-- | ngxtop/config_parser.py | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | ngxtop/ngxtop.py | 0 | ||||
| -rw-r--r-- | ngxtop/utils.py | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ngxtop/config_parser.py b/ngxtop/config_parser.py index 430ac23..0d9f00a 100644 --- a/ngxtop/config_parser.py +++ b/ngxtop/config_parser.py @@ -106,7 +106,7 @@ def detect_log_config(arguments): log_formats = dict(get_log_formats(config_str)) if len(access_logs) == 1: - log_path, format_name = access_logs.items()[0] + log_path, format_name = list(access_logs.items())[0] if format_name == 'combined': return log_path, LOG_FORMAT_COMBINED if format_name not in log_formats: @@ -115,7 +115,7 @@ def detect_log_config(arguments): # multiple access logs configured, offer to select one print('Multiple access logs detected in configuration:') - log_path = choose_one(access_logs.keys(), 'Select access log file to process: ') + log_path = choose_one(list(access_logs.keys()), 'Select access log file to process: ') format_name = access_logs[log_path] if format_name not in log_formats: error_exit('Incorrect format name set in config for access log file "%s"' % log_path) diff --git a/ngxtop/ngxtop.py b/ngxtop/ngxtop.py index 8667b8b..8667b8b 100755..100644 --- a/ngxtop/ngxtop.py +++ b/ngxtop/ngxtop.py diff --git a/ngxtop/utils.py b/ngxtop/utils.py index ef61072..7bd9a2a 100644 --- a/ngxtop/utils.py +++ b/ngxtop/utils.py @@ -5,6 +5,8 @@ def choose_one(choices, prompt): for idx, choice in enumerate(choices): print('%d. %s' % (idx + 1, choice)) selected = None + if sys.version[0] == '3': + raw_input = input while not selected or selected <= 0 or selected > len(choices): selected = raw_input(prompt) try: @@ -16,4 +18,4 @@ def choose_one(choices, prompt): def error_exit(msg, status=1): sys.stderr.write('Error: %s\n' % msg) - sys.exit(status)
\ No newline at end of file + sys.exit(status) |