From c382d3807a3bba80a2e214d57792063fca91af7d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 5 Nov 2026 21:34:04 -0500 Subject: [PATCH] style: use `import color` everywhere Align with Google style guides and `import color` as a module rather than import symbols out of it. Change-Id: Id3f1f8ea324097d6e1ea5ed33c67b4b024abce7f Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/654810 Commit-Queue: Mike Frysinger Reviewed-by: Brian Gan Tested-by: Mike Frysinger --- .flake8 | 2 -- main.py | 4 ++-- project.py | 8 ++++---- repo_logging.py | 4 ++-- subcmds/branches.py | 6 +++--- subcmds/diffmanifests.py | 6 +++--- subcmds/forall.py | 10 +++++----- subcmds/grep.py | 6 +++--- subcmds/help.py | 6 +++--- subcmds/info.py | 6 +++--- subcmds/init.py | 6 +++--- subcmds/overview.py | 6 +++--- subcmds/prune.py | 6 +++--- subcmds/rebase.py | 6 +++--- subcmds/stage.py | 6 +++--- subcmds/status.py | 6 +++--- tests/test_repo_logging.py | 4 ++-- 17 files changed, 48 insertions(+), 50 deletions(-) diff --git a/.flake8 b/.flake8 index 34b3862a0..6f02df763 100644 --- a/.flake8 +++ b/.flake8 @@ -14,7 +14,6 @@ per-file-ignores = main.py: IMR241, manifest_xml.py: IMR241, project.py: IMR241, - repo_logging.py: IMR241, subcmds/abandon.py: IMR241, subcmds/branches.py: IMR241, subcmds/checkout.py: IMR241, @@ -52,7 +51,6 @@ per-file-ignores = tests/test_command.py: IMR241, tests/test_error.py: IMR241, tests/test_main.py: IMR241, - tests/test_repo_logging.py: IMR241, tests/test_subcmds.py: IMR241, tests/test_subcmds_sync.py: IMR241, extend-ignore = diff --git a/main.py b/main.py index e01144acf..4d2150253 100755 --- a/main.py +++ b/main.py @@ -41,7 +41,7 @@ try: except ImportError: kerberos = None -from color import SetDefaultColoring +import color from command import InteractiveCommand from command import MirrorSafeCommand import editor @@ -387,7 +387,7 @@ class _Repo: def _RunLong(self, name, gopts, argv, git_trace2_event_log): """Execute the (longer running) requested subcommand.""" result = 0 - SetDefaultColoring(gopts.color) + color.SetDefaultColoring(gopts.color) outer_client = RepoClient(self.repodir) repo_client = outer_client diff --git a/project.py b/project.py index 5e0671ec3..b1fd93108 100644 --- a/project.py +++ b/project.py @@ -32,7 +32,7 @@ import time from typing import Any, Dict, List, NamedTuple, Optional, Tuple import urllib.parse -from color import Coloring +import color import error import fetch import git_command @@ -382,7 +382,7 @@ class ReviewableBranch: return refs -class StatusColoring(Coloring): +class StatusColoring(color.Coloring): def __init__(self, config): super().__init__(config, "status") self.project = self.printer("header", attr="bold") @@ -395,7 +395,7 @@ class StatusColoring(Coloring): self.untracked = self.printer("untracked", fg="red") -class DiffColoring(Coloring): +class DiffColoring(color.Coloring): def __init__(self, config): super().__init__(config, "diff") self.project = self.printer("header", attr="bold") @@ -5512,7 +5512,7 @@ class _Later: return False -class _SyncColoring(Coloring): +class _SyncColoring(color.Coloring): def __init__(self, config): super().__init__(config, "reposync") self.project = self.printer("header", attr="bold") diff --git a/repo_logging.py b/repo_logging.py index a736106fc..a6caafc71 100644 --- a/repo_logging.py +++ b/repo_logging.py @@ -16,7 +16,7 @@ import logging -from color import Coloring +import color import error @@ -34,7 +34,7 @@ class _ConfigMock: return self.default_values.get(x, None) -class _LogColoring(Coloring): +class _LogColoring(color.Coloring): """Coloring outstream for logging.""" def __init__(self, config): diff --git a/subcmds/branches.py b/subcmds/branches.py index b7a45b4a5..bbc87b797 100644 --- a/subcmds/branches.py +++ b/subcmds/branches.py @@ -15,14 +15,14 @@ import itertools import sys -from color import Coloring +import color from command import Command from command import DEFAULT_LOCAL_JOBS -class BranchColoring(Coloring): +class BranchColoring(color.Coloring): def __init__(self, config): - Coloring.__init__(self, config, "branch") + super().__init__(config, "branch") self.current = self.printer("current", fg="green") self.local = self.printer("local") self.notinproject = self.printer("notinproject", fg="red") diff --git a/subcmds/diffmanifests.py b/subcmds/diffmanifests.py index 66b3183da..5f27d2db9 100644 --- a/subcmds/diffmanifests.py +++ b/subcmds/diffmanifests.py @@ -12,14 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -from color import Coloring +import color from command import PagedCommand from manifest_xml import RepoClient -class _Coloring(Coloring): +class _Coloring(color.Coloring): def __init__(self, config): - Coloring.__init__(self, config, "status") + super().__init__(config, "status") class Diffmanifests(PagedCommand): diff --git a/subcmds/forall.py b/subcmds/forall.py index 05096d654..a7913ae1e 100644 --- a/subcmds/forall.py +++ b/subcmds/forall.py @@ -21,7 +21,7 @@ import signal import subprocess import sys -from color import Coloring +import color from command import Command from command import DEFAULT_LOCAL_JOBS from command import MirrorSafeCommand @@ -37,9 +37,9 @@ _CAN_COLOR = [ ] -class ForallColoring(Coloring): +class ForallColoring(color.Coloring): def __init__(self, config): - Coloring.__init__(self, config, "forall") + super().__init__(config, "forall") self.project = self.printer("project", attr="bold") @@ -234,9 +234,9 @@ without iterating through the remaining projects. cn = None if cn and cn in _CAN_COLOR: - class ColorCmd(Coloring): + class ColorCmd(color.Coloring): def __init__(self, config, cmd): - Coloring.__init__(self, config, cmd) + super().__init__(config, cmd) if ColorCmd(self.manifest.manifestProject.config, cn).is_on: cmd.insert(cmd.index(cn) + 1, "--color") diff --git a/subcmds/grep.py b/subcmds/grep.py index cb2645666..f726cbe50 100644 --- a/subcmds/grep.py +++ b/subcmds/grep.py @@ -16,7 +16,7 @@ import functools import sys from typing import NamedTuple -from color import Coloring +import color from command import DEFAULT_LOCAL_JOBS from command import PagedCommand import error @@ -27,9 +27,9 @@ import repo_logging logger = repo_logging.RepoLogger(__file__) -class GrepColoring(Coloring): +class GrepColoring(color.Coloring): def __init__(self, config): - Coloring.__init__(self, config, "grep") + super().__init__(config, "grep") self.project = self.printer("project", attr="bold") self.fail = self.printer("fail", fg="red") diff --git a/subcmds/help.py b/subcmds/help.py index ba1414a86..79c59f7ae 100644 --- a/subcmds/help.py +++ b/subcmds/help.py @@ -16,7 +16,7 @@ import re import sys import textwrap -from color import Coloring +import color from command import MirrorSafeCommand from command import PagedCommand import error @@ -87,9 +87,9 @@ Displays detailed usage information about a command. print("Bug reports:", Wrapper().BUG_URL) def _PrintCommandHelp(self, cmd, header_prefix=""): - class _Out(Coloring): + class _Out(color.Coloring): def __init__(self, gc): - Coloring.__init__(self, gc, "help") + super().__init__(gc, "help") self.heading = self.printer("heading", attr="bold") self._first = True diff --git a/subcmds/info.py b/subcmds/info.py index aed7d4029..0e0431727 100644 --- a/subcmds/info.py +++ b/subcmds/info.py @@ -20,7 +20,7 @@ import optparse import sys from typing import Any, Dict, List, NamedTuple, Optional, Tuple -from color import Coloring +import color from command import DEFAULT_LOCAL_JOBS from command import PagedCommand import git_refs @@ -46,9 +46,9 @@ class OutputFormat(enum.Enum): JSON = enum.auto() -class _Coloring(Coloring): +class _Coloring(color.Coloring): def __init__(self, config): - Coloring.__init__(self, config, "status") + super().__init__(config, "status") class Info(PagedCommand): diff --git a/subcmds/init.py b/subcmds/init.py index daa6f0489..3efd6a028 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -15,7 +15,7 @@ import os import sys -from color import Coloring +import color from command import InteractiveCommand from command import MirrorSafeCommand import error @@ -244,9 +244,9 @@ to update the working directory files. if self._HasColorSet(gc): return - class _Test(Coloring): + class _Test(color.Coloring): def __init__(self): - Coloring.__init__(self, gc, "test color display") + super().__init__(gc, "test color display") self._on = True out = _Test() diff --git a/subcmds/overview.py b/subcmds/overview.py index c5fb9d36f..e4b6a4072 100644 --- a/subcmds/overview.py +++ b/subcmds/overview.py @@ -14,7 +14,7 @@ import optparse -from color import Coloring +import color from command import PagedCommand @@ -73,9 +73,9 @@ are displayed. if not all_branches: return - class Report(Coloring): + class Report(color.Coloring): def __init__(self, config): - Coloring.__init__(self, config, "status") + super().__init__(config, "status") self.project = self.printer("header", attr="bold") self.text = self.printer("text") diff --git a/subcmds/prune.py b/subcmds/prune.py index 1325eceeb..3bc0603fa 100644 --- a/subcmds/prune.py +++ b/subcmds/prune.py @@ -14,7 +14,7 @@ import itertools -from color import Coloring +import color from command import DEFAULT_LOCAL_JOBS from command import PagedCommand @@ -56,9 +56,9 @@ class Prune(PagedCommand): if not all_branches: return - class Report(Coloring): + class Report(color.Coloring): def __init__(self, config): - Coloring.__init__(self, config, "status") + super().__init__(config, "status") self.project = self.printer("header", attr="bold") out = Report(all_branches[0].project.config) diff --git a/subcmds/rebase.py b/subcmds/rebase.py index 6b39f36c3..cbfaaaa8c 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py @@ -14,7 +14,7 @@ import sys -from color import Coloring +import color from command import Command import error import git_command @@ -25,9 +25,9 @@ import repo_logging logger = repo_logging.RepoLogger(__file__) -class RebaseColoring(Coloring): +class RebaseColoring(color.Coloring): def __init__(self, config): - Coloring.__init__(self, config, "rebase") + super().__init__(config, "rebase") self.project = self.printer("project", attr="bold") self.fail = self.printer("fail", fg="red") diff --git a/subcmds/stage.py b/subcmds/stage.py index 5bda7a54d..7d36e8570 100644 --- a/subcmds/stage.py +++ b/subcmds/stage.py @@ -14,7 +14,7 @@ import sys -from color import Coloring +import color from command import InteractiveCommand import git_command import repo_logging @@ -23,9 +23,9 @@ import repo_logging logger = repo_logging.RepoLogger(__file__) -class _ProjectList(Coloring): +class _ProjectList(color.Coloring): def __init__(self, gc): - Coloring.__init__(self, gc, "interactive") + super().__init__(gc, "interactive") self.prompt = self.printer("prompt", fg="blue", attr="bold") self.header = self.printer("header", attr="bold") self.help = self.printer("help", fg="red", attr="bold") diff --git a/subcmds/status.py b/subcmds/status.py index 1434eeafa..11deb61ab 100644 --- a/subcmds/status.py +++ b/subcmds/status.py @@ -17,7 +17,7 @@ import glob import io import os -from color import Coloring +import color from command import DEFAULT_LOCAL_JOBS from command import PagedCommand import platform_utils @@ -180,9 +180,9 @@ the following meanings: (head, _tail) = os.path.split(head) proj_dirs.add(".repo") - class StatusColoring(Coloring): + class StatusColoring(color.Coloring): def __init__(self, config): - Coloring.__init__(self, config, "status") + super().__init__(config, "status") self.project = self.printer("header", attr="bold") self.untracked = self.printer("untracked", fg="red") diff --git a/tests/test_repo_logging.py b/tests/test_repo_logging.py index 28a80bd0d..5828f776f 100644 --- a/tests/test_repo_logging.py +++ b/tests/test_repo_logging.py @@ -22,7 +22,7 @@ from unittest import mock import pytest -from color import SetDefaultColoring +import color import error import repo_logging @@ -86,7 +86,7 @@ def test_log_with_format_string(level: int) -> None: # Set color output to "always" for consistent test results. # This ensures the logger's behavior is uniform across different # environments and git configurations. - SetDefaultColoring("always") + color.SetDefaultColoring("always") # Regex pattern to match optional ANSI color codes. # \033 - Escape character