From 0f83e19bbbe66609b7c402ef47b6babd1e2205ef Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 5 Nov 2026 21:54:42 -0500 Subject: [PATCH] style: use `import git_trace2_event_log_base` everywhere Align with Google style guides and `import git_trace2_event_log_base` as a module rather than import symbols out of it. Change-Id: I98c68a9ddca06325a8e0a620346c408e1ff3b661 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/654816 Tested-by: Mike Frysinger Commit-Queue: Mike Frysinger Reviewed-by: Brian Gan --- .flake8 | 1 - git_command.py | 4 ++-- git_trace2_event_log.py | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.flake8 b/.flake8 index 10b0980cf..f703772b9 100644 --- a/.flake8 +++ b/.flake8 @@ -9,7 +9,6 @@ per-file-ignores = command.py: IMR241, git_command.py: IMR241, git_status.py: IMR241, - git_trace2_event_log.py: IMR241, main.py: IMR241, manifest_xml.py: IMR241, subcmds/abandon.py: IMR241, diff --git a/git_command.py b/git_command.py index 5830a10cc..0032c2c5d 100644 --- a/git_command.py +++ b/git_command.py @@ -21,7 +21,7 @@ import sys from typing import Any, Optional import error -from git_trace2_event_log_base import BaseEventLog +import git_trace2_event_log_base import platform_utils import repo_logging import repo_trace @@ -347,7 +347,7 @@ class GitCommand: command.extend(cmdv[1:]) event_log = ( - BaseEventLog(env=env, add_init_count=True) + git_trace2_event_log_base.BaseEventLog(env=env, add_init_count=True) if add_event_log else None ) diff --git a/git_trace2_event_log.py b/git_trace2_event_log.py index 4f2fe7400..1f0556518 100644 --- a/git_trace2_event_log.py +++ b/git_trace2_event_log.py @@ -15,10 +15,10 @@ """Event logging in the git trace2 EVENT format.""" import git_command -from git_trace2_event_log_base import BaseEventLog +import git_trace2_event_log_base -class EventLog(BaseEventLog): +class EventLog(git_trace2_event_log_base.BaseEventLog): """Event log that records events that occurred during a repo invocation. Events are written to the log as a consecutive JSON entries, one per line.