diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 24e7372..79967b7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,3 +7,5 @@ updates: time: "01:30" open-pull-requests-limit: 10 target-branch: dev + assignees: + - "sepandhaghighi" diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d50988..60c59a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - `nava` added to `requirements.txt` - Test system modified - Build system modified +- `get_input_standard` function modified - `Python 3.11` added to `test.yml` - `Python 3.12` added to `test.yml` - `Python 3.5` support dropped diff --git a/nafas/functions.py b/nafas/functions.py index 8670618..6833a0e 100644 --- a/nafas/functions.py +++ b/nafas/functions.py @@ -189,9 +189,9 @@ def input_filter(input_data): :return: filtered data as dict """ filtered_data = input_data.copy() - if filtered_data["program"] not in STANDARD_MENU["program"].keys(): + if filtered_data["program"] not in STANDARD_MENU["program"]: filtered_data["program"] = 1 - if filtered_data["level"] not in STANDARD_MENU["level"].keys(): + if filtered_data["level"] not in STANDARD_MENU["level"]: filtered_data["level"] = 1 return filtered_data @@ -207,24 +207,15 @@ def get_input_standard(input_func=input): input_data = {"program": 1, "level": 1} for item in STANDARD_MENU_ORDER: exit_flag = False - sorted_list = sorted(list(STANDARD_MENU[item].keys())) + sorted_list = sorted(STANDARD_MENU[item]) print("- Please choose a {0} : \n".format(item)) for i in sorted_list: if item == "program": program_name = STANDARD_MENU[item][i] - program_average_time = time_average_calc( - PROGRAMS[program_name]) - print( - str(i) + - "- " + - program_name + - " (~ " + - time_convert( - program_average_time, - True) + - ")") + program_average_time = time_average_calc(PROGRAMS[program_name]) + print("{0}- {1} (~ {2})".format(i, program_name, time_convert(program_average_time, True))) else: - print(str(i) + "- " + STANDARD_MENU[item][i]) + print("{0}- {1}".format(i, STANDARD_MENU[item][i])) while not exit_flag: try: input_data[item] = int(input_func("")) @@ -274,7 +265,7 @@ def graphic_counter(delay_time): time.sleep(remain_time) if remain_time != 0: print('.', end=' ', flush=True) - print() + print("") def play_sound(sound_path, enable=True):