From cd391e77d0462b2768f4f5deb5954a6f456047e9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 25 Mar 2025 12:53:55 -0400 Subject: [PATCH] black: update to v25 Requires a little reformatting in the tree. Change-Id: Iaa40fe0dfca372c49c04cc26edccb5f7b0c2a8ad Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/462883 Commit-Queue: Mike Frysinger Reviewed-by: Gavin Mak Tested-by: Mike Frysinger --- git_command.py | 12 ++++++------ manifest_xml.py | 38 +++++++++++++++++++------------------- run_tests.vpython3 | 14 +++++++------- subcmds/diffmanifests.py | 6 +++--- tests/test_manifest_xml.py | 2 +- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/git_command.py b/git_command.py index 55216b1c..04844079 100644 --- a/git_command.py +++ b/git_command.py @@ -238,9 +238,9 @@ def _build_env( s = p + " " + s env["GIT_CONFIG_PARAMETERS"] = s if "GIT_ALLOW_PROTOCOL" not in env: - env[ - "GIT_ALLOW_PROTOCOL" - ] = "file:git:http:https:ssh:persistent-http:persistent-https:sso:rpc" + env["GIT_ALLOW_PROTOCOL"] = ( + "file:git:http:https:ssh:persistent-http:persistent-https:sso:rpc" + ) env["GIT_HTTP_USER_AGENT"] = user_agent.git if objdir: @@ -350,9 +350,9 @@ class GitCommand: "Project": e.project, "CommandName": command_name, "Message": str(e), - "ReturnCode": str(e.git_rc) - if e.git_rc is not None - else None, + "ReturnCode": ( + str(e.git_rc) if e.git_rc is not None else None + ), "IsError": log_as_error, } ) diff --git a/manifest_xml.py b/manifest_xml.py index 347ae5ef..60d126fb 100644 --- a/manifest_xml.py +++ b/manifest_xml.py @@ -1014,9 +1014,9 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md def SetManifestOverride(self, path): """Override manifestFile. The caller must call Unload()""" - self._outer_client.manifest.manifestFileOverrides[ - self.path_prefix - ] = path + self._outer_client.manifest.manifestFileOverrides[self.path_prefix] = ( + path + ) @property def UseLocalManifests(self): @@ -2112,22 +2112,22 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md # implementation: # https://eclipse.googlesource.com/jgit/jgit/+/9110037e3e9461ff4dac22fee84ef3694ed57648/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java#884 BAD_CODEPOINTS = { - "\u200C", # ZERO WIDTH NON-JOINER - "\u200D", # ZERO WIDTH JOINER - "\u200E", # LEFT-TO-RIGHT MARK - "\u200F", # RIGHT-TO-LEFT MARK - "\u202A", # LEFT-TO-RIGHT EMBEDDING - "\u202B", # RIGHT-TO-LEFT EMBEDDING - "\u202C", # POP DIRECTIONAL FORMATTING - "\u202D", # LEFT-TO-RIGHT OVERRIDE - "\u202E", # RIGHT-TO-LEFT OVERRIDE - "\u206A", # INHIBIT SYMMETRIC SWAPPING - "\u206B", # ACTIVATE SYMMETRIC SWAPPING - "\u206C", # INHIBIT ARABIC FORM SHAPING - "\u206D", # ACTIVATE ARABIC FORM SHAPING - "\u206E", # NATIONAL DIGIT SHAPES - "\u206F", # NOMINAL DIGIT SHAPES - "\uFEFF", # ZERO WIDTH NO-BREAK SPACE + "\u200c", # ZERO WIDTH NON-JOINER + "\u200d", # ZERO WIDTH JOINER + "\u200e", # LEFT-TO-RIGHT MARK + "\u200f", # RIGHT-TO-LEFT MARK + "\u202a", # LEFT-TO-RIGHT EMBEDDING + "\u202b", # RIGHT-TO-LEFT EMBEDDING + "\u202c", # POP DIRECTIONAL FORMATTING + "\u202d", # LEFT-TO-RIGHT OVERRIDE + "\u202e", # RIGHT-TO-LEFT OVERRIDE + "\u206a", # INHIBIT SYMMETRIC SWAPPING + "\u206b", # ACTIVATE SYMMETRIC SWAPPING + "\u206c", # INHIBIT ARABIC FORM SHAPING + "\u206d", # ACTIVATE ARABIC FORM SHAPING + "\u206e", # NATIONAL DIGIT SHAPES + "\u206f", # NOMINAL DIGIT SHAPES + "\ufeff", # ZERO WIDTH NO-BREAK SPACE } if BAD_CODEPOINTS & path_codepoints: # This message is more expansive than reality, but should be fine. diff --git a/run_tests.vpython3 b/run_tests.vpython3 index b2b5ce48..e4c62c11 100644 --- a/run_tests.vpython3 +++ b/run_tests.vpython3 @@ -56,40 +56,40 @@ wheel: < wheel: < name: "infra/python/wheels/black-py3" - version: "version:23.1.0" + version: "version:25.1.0" > -# Required by black==23.1.0 +# Required by black==25.1.0 wheel: < name: "infra/python/wheels/mypy-extensions-py3" version: "version:0.4.3" > -# Required by black==23.1.0 +# Required by black==25.1.0 wheel: < name: "infra/python/wheels/tomli-py3" version: "version:2.0.1" > -# Required by black==23.1.0 +# Required by black==25.1.0 wheel: < name: "infra/python/wheels/platformdirs-py3" version: "version:2.5.2" > -# Required by black==23.1.0 +# Required by black==25.1.0 wheel: < name: "infra/python/wheels/pathspec-py3" version: "version:0.9.0" > -# Required by black==23.1.0 +# Required by black==25.1.0 wheel: < name: "infra/python/wheels/typing-extensions-py3" version: "version:4.3.0" > -# Required by black==23.1.0 +# Required by black==25.1.0 wheel: < name: "infra/python/wheels/click-py3" version: "version:8.0.3" diff --git a/subcmds/diffmanifests.py b/subcmds/diffmanifests.py index 88b697b6..3eee3f94 100644 --- a/subcmds/diffmanifests.py +++ b/subcmds/diffmanifests.py @@ -233,9 +233,9 @@ synced and their revisions won't be found. ) self.printRevision = self.out.nofmt_printer("revision", fg="yellow") else: - self.printProject = ( - self.printAdded - ) = self.printRemoved = self.printRevision = self.printText + self.printProject = self.printAdded = self.printRemoved = ( + self.printRevision + ) = self.printText manifest1 = RepoClient(self.repodir) manifest1.Override(args[0], load_local_manifests=False) diff --git a/tests/test_manifest_xml.py b/tests/test_manifest_xml.py index 3d1fde96..ebc0ce58 100644 --- a/tests/test_manifest_xml.py +++ b/tests/test_manifest_xml.py @@ -51,7 +51,7 @@ INVALID_FS_PATHS = ( "foo~", "blah/foo~", # Block Unicode characters that get normalized out by filesystems. - "foo\u200Cbar", + "foo\u200cbar", # Block newlines. "f\n/bar", "f\r/bar",