From 819b8b2672cf5f237914a38faa8d8034c65a83bd Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sun, 25 Jun 2023 21:27:18 -0700 Subject: [PATCH] tolerate missing final newline --- aider/diffs.py | 3 ++- scripts/benchmark.py | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/aider/diffs.py b/aider/diffs.py index 730e43e1b..a2e2e7732 100644 --- a/aider/diffs.py +++ b/aider/diffs.py @@ -34,9 +34,10 @@ def create_progress_bar(percentage): def assert_newlines(lines): + dump(lines) if not lines: return - for line in lines: + for line in lines[:-1]: assert line and line[-1] == "\n", line diff --git a/scripts/benchmark.py b/scripts/benchmark.py index 0244efb12..be4c92f52 100644 --- a/scripts/benchmark.py +++ b/scripts/benchmark.py @@ -209,7 +209,10 @@ def summarize_results(dirname, all_results, total_tests=None): remaining_seconds = (total_tests - completed_tests) * avg_duration remaining_minutes, remaining_seconds = divmod(remaining_seconds, 60) - console.print(f"duration: {avg_duration:.1f} sec/test-case, {remaining_minutes:.0f}:{remaining_seconds:02.0f} remaining") + console.print( + f"duration: {avg_duration:.1f} sec/test-case," + f" {remaining_minutes:2.0f}:{remaining_seconds:02.0f} remaining" + ) avg_cost = total_cost / completed_tests @@ -324,7 +327,7 @@ Only use standard python libraries, don't suggest installing any packages. errors = "\n".join(errors) instructions = errors instructions += ( - "\n\n####\n\nFix the code in {file_list} to resolve the test failures above." + f"\n\n####\n\nFix the code in {file_list} to resolve the test failures above." ) results = dict(