From 801e917eecb54a4fee67929f72a6ae2608af2690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristi=C3=A1n=20Maureira-Fredes?= Date: Tue, 28 Jun 2022 16:24:16 +0200 Subject: fullrun: use context managers when opening files Replacing the 'f = open(...)' by a context manager: 'with open(...) as f:' Change-Id: I8b47f41179ec66185195676eb8ee507cfdf15d2a Reviewed-by: Edward Welbourne Reviewed-by: David Skoland --- scripts/api-review/fullrun/gitfunctions.py | 28 ++++++++++++++-------------- scripts/api-review/fullrun/run.py | 5 ++--- 2 files changed, 16 insertions(+), 17 deletions(-) (limited to 'scripts') diff --git a/scripts/api-review/fullrun/gitfunctions.py b/scripts/api-review/fullrun/gitfunctions.py index 89b5c59..db2c381 100644 --- a/scripts/api-review/fullrun/gitfunctions.py +++ b/scripts/api-review/fullrun/gitfunctions.py @@ -42,27 +42,27 @@ def get_submodules(git_repo: str = '.', branch: str = 'current') -> {}: print(f'Error: {modules_path} not found') return modules - modules_file = open(modules_path, 'r') read_state = 0 current_module = {} - for line in modules_file: - if line.startswith('[submodule'): - if 'name' in current_module: - modules[current_module['name']] = current_module + with open(modules_path) as modules_file: + for line in modules_file: + if line.startswith('[submodule'): + if 'name' in current_module: + modules[current_module['name']] = current_module - read_state = 1 - module_name = line.split(' ')[1].replace('"', '').replace(']', '').strip() + read_state = 1 + module_name = line.split(' ')[1].replace('"', '').replace(']', '').strip() - current_module = {'name': module_name} - elif read_state == 1: - if '=' in line: - elements = line.split('=') - key = elements[0].strip() - value = elements[1].strip() + current_module = {'name': module_name} + elif read_state == 1: + if '=' in line: + elements = line.split('=') + key = elements[0].strip() + value = elements[1].strip() - current_module[key] = value + current_module[key] = value if branch != 'current': os.system(f'git checkout {current_branch}') diff --git a/scripts/api-review/fullrun/run.py b/scripts/api-review/fullrun/run.py index 7c351df..594ffac 100644 --- a/scripts/api-review/fullrun/run.py +++ b/scripts/api-review/fullrun/run.py @@ -49,9 +49,8 @@ def get_api_review_script() -> str: # Write module data to json file def export_modules(modules: {}, filename: str): - outfile = open(filename, 'w') - outfile.write(json.dumps(modules, indent=4)) - outfile.close() + with open(filename, 'w') as outfile: + outfile.write(json.dumps(modules, indent=4)) def branch_exists(branch: str, repo: str = '.') -> bool: -- cgit v1.2.1