From: Simon Glass <simon.glass@canonical.com> Replace manual open() calls with tools.read_file() and tools.write_file() for consistency with the rest of the codebase. Co-developed-by: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- tools/pickman/agent.py | 5 +++-- tools/pickman/control.py | 13 +++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/pickman/agent.py b/tools/pickman/agent.py index 63952c1c005..4b914e314e8 100644 --- a/tools/pickman/agent.py +++ b/tools/pickman/agent.py @@ -14,6 +14,7 @@ our_path = os.path.dirname(os.path.realpath(__file__)) sys.path.insert(0, os.path.join(our_path, '..')) # pylint: disable=wrong-import-position,import-error +from u_boot_pylib import tools from u_boot_pylib import tout # Signal file for agent to communicate status back to pickman @@ -278,8 +279,8 @@ def read_signal_file(repo_path=None): return None, None try: - with open(signal_path, 'r', encoding='utf-8') as fhandle: - lines = fhandle.read().strip().split('\n') + data = tools.read_file(signal_path, binary=False) + lines = data.strip().split('\n') status = lines[0] if lines else None last_commit = lines[1] if len(lines) > 1 else None diff --git a/tools/pickman/control.py b/tools/pickman/control.py index 48f7ced1617..057e4400adb 100644 --- a/tools/pickman/control.py +++ b/tools/pickman/control.py @@ -26,6 +26,7 @@ from pickman import ftest from pickman import gitlab_api from u_boot_pylib import command from u_boot_pylib import terminal +from u_boot_pylib import tools from u_boot_pylib import tout # Default database filename @@ -1458,8 +1459,7 @@ def get_history(fname, source, commits, branch_name, conv_log): # Read existing content existing = '' if os.path.exists(fname): - with open(fname, 'r', encoding='utf-8') as fhandle: - existing = fhandle.read() + existing = tools.read_file(fname, binary=False) # Remove existing entry for this branch (from ## header to ---) pattern = rf'## [^\n]+\n\nBranch: {re.escape(branch_name)}\n.*?---\n\n' existing = re.sub(pattern, '', existing, flags=re.DOTALL) @@ -1467,8 +1467,7 @@ def get_history(fname, source, commits, branch_name, conv_log): content = existing + entry # Write updated history file - with open(fname, 'w', encoding='utf-8') as fhandle: - fhandle.write(content) + tools.write_file(fname, content, binary=False) # Generate commit message commit_msg = (f'pickman: Record cherry-pick of {len(commits)} commits ' @@ -2429,11 +2428,9 @@ Comments addressed: # Append to history file existing = '' if os.path.exists(HISTORY_FILE): - with open(HISTORY_FILE, 'r', encoding='utf-8') as fhandle: - existing = fhandle.read() + existing = tools.read_file(HISTORY_FILE, binary=False) - with open(HISTORY_FILE, 'w', encoding='utf-8') as fhandle: - fhandle.write(existing + entry) + tools.write_file(HISTORY_FILE, existing + entry, binary=False) # Commit the history file run_git(['add', '-f', HISTORY_FILE]) -- 2.43.0