style: use import wrapper everywhere

Align with Google style guides and `import wrapper` as a module
rather than import symbols out of it.

Change-Id: Ifc6165974a242a1ce38bd09b1b4226dc0ba943d5
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/654817
Reviewed-by: Brian Gan <brgan@google.com>
Commit-Queue: Mike Frysinger <vapier@google.com>
Tested-by: Mike Frysinger <vapier@google.com>

.flake8

@@ -7,7 +7,6 @@ per-file-ignores =
     # IMR241: When using the from syntax, only submodules are imported, not module elements.
     # NB: Do not add any more here.
     command.py: IMR241,
-    git_command.py: IMR241,
     git_status.py: IMR241,
     main.py: IMR241,
     manifest_xml.py: IMR241,

git_command.py

@@ -25,7 +25,7 @@ import git_trace2_event_log_base
 import platform_utils
 import repo_logging
 import repo_trace
-from wrapper import Wrapper
+import wrapper
 
 
 GIT = "git"
@@ -46,7 +46,7 @@ logger = repo_logging.RepoLogger(__file__)
 class _GitCall:
     @functools.lru_cache(maxsize=None)  # noqa: B019
     def version_tuple(self):
-        ret = Wrapper().ParseGitVersion()
+        ret = wrapper.Wrapper().ParseGitVersion()
         if ret is None:
             msg = "fatal: unable to detect git version"
             logger.error(msg)

main.py

@@ -55,8 +55,7 @@ import pager
 import repo_trace
 from subcmds import all_commands
 from subcmds.version import Version
-from wrapper import Wrapper
-from wrapper import WrapperPath
+import wrapper
 
 
 logger = repo_logging.RepoLogger(__file__)
@@ -194,7 +193,7 @@ class _Repo:
             help_commands = "".join(f"\n  {x}" for x in wrapped_commands)
             print(f"Available commands:{help_commands}")
             print("\nRun `repo help <command>` for command-specific details.")
-            print("Bug reports:", Wrapper().BUG_URL)
+            print("Bug reports:", wrapper.Wrapper().BUG_URL)
         else:
             cmd = self.commands["help"]()
             if all_commands:
@@ -628,7 +627,7 @@ def _CheckWrapperVersion(ver_str, repo_path):
         sys.exit(1)
 
     # Pull out the version of the repo launcher we know about to compare.
-    exp = Wrapper().VERSION
+    exp = wrapper.Wrapper().VERSION
     ver = tuple(map(int, ver_str.split(".")))
 
     exp_str = ".".join(map(str, exp))
@@ -646,7 +645,7 @@ repo: error:
             ver_str,
             min_str,
             exp_str,
-            WrapperPath(),
+            wrapper.WrapperPath(),
             repo_path,
         )
         sys.exit(1)
@@ -661,7 +660,7 @@ repo: error:
 ... You should upgrade soon:
     cp %s %s
 """,
-                WrapperPath(),
+                wrapper.WrapperPath(),
                 repo_path,
             )
         else:
@@ -672,7 +671,7 @@ repo: error:
 !!! The launcher is not writable.  Please talk to your sysadmin or distro
 !!! to get an update installed.
 """,
-                WrapperPath(),
+                wrapper.WrapperPath(),
                 repo_path,
             )
 

manifest_xml.py

@@ -31,7 +31,7 @@ from project import ManifestProject
 from project import Project
 from project import RemoteSpec
 from project import RepoProject
-from wrapper import Wrapper
+import wrapper
 
 
 MANIFEST_FILE_NAME = "manifest.xml"
@@ -820,7 +820,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
                 e.setAttribute("revision", self._superproject.revision)
             root.appendChild(e)
 
-        if self._contactinfo.bugurl != Wrapper().BUG_URL:
+        if self._contactinfo.bugurl != wrapper.Wrapper().BUG_URL:
             root.appendChild(doc.createTextNode(""))
             e = doc.createElement("contactinfo")
             e.setAttribute("bugurl", self._contactinfo.bugurl)
@@ -1182,7 +1182,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
         self._submanifests = {}
         self._repo_hooks_project = None
         self._superproject = None
-        self._contactinfo = ContactInfo(Wrapper().BUG_URL)
+        self._contactinfo = ContactInfo(wrapper.Wrapper().BUG_URL)
         self._notice = None
         self.branch = None
         self._manifest_server = None

subcmds/help.py

@@ -21,7 +21,7 @@ from command import MirrorSafeCommand
 from command import PagedCommand
 import error
 from subcmds import all_commands
-from wrapper import Wrapper
+import wrapper
 
 
 class InvalidHelpCommand(error.RepoExitError):
@@ -65,7 +65,7 @@ Displays detailed usage information about a command.
             "See 'repo help <command>' for more information on a "
             "specific command."
         )
-        print("Bug reports:", Wrapper().BUG_URL)
+        print("Bug reports:", wrapper.Wrapper().BUG_URL)
 
     def _PrintCommonCommands(self):
         print("usage: repo COMMAND [ARGS]")
@@ -84,7 +84,7 @@ Displays detailed usage information about a command.
             "command.\nSee 'repo help --all' for a complete list of recognized "
             "commands."
         )
-        print("Bug reports:", Wrapper().BUG_URL)
+        print("Bug reports:", wrapper.Wrapper().BUG_URL)
 
     def _PrintCommandHelp(self, cmd, header_prefix=""):
         class _Out(color.Coloring):

subcmds/init.py

@@ -21,8 +21,7 @@ from command import MirrorSafeCommand
 import error
 import git_command
 import repo_logging
-from wrapper import Wrapper
-from wrapper import WrapperDir
+import wrapper
 
 
 logger = repo_logging.RepoLogger(__file__)
@@ -95,7 +94,7 @@ to update the working directory files.
         """Disable due to re-use of Wrapper()."""
 
     def _Options(self, p):
-        Wrapper().InitParser(p)
+        wrapper.Wrapper().InitParser(p)
         m = p.add_option_group("Multi-manifest")
         m.add_option(
             "--outer-manifest",
@@ -344,9 +343,7 @@ to update the working directory files.
                 self.OptionParser.error("too many arguments to init")
 
     def Execute(self, opt, args):
-        wrapper = Wrapper()
-
-        reqs = wrapper.Requirements.from_dir(WrapperDir())
+        reqs = wrapper.Wrapper().Requirements.from_dir(wrapper.WrapperDir())
         git_command.git_require(reqs.get_hard_ver("git"), fail=True)
         min_git_version_soft = reqs.get_soft_ver("git")
         if not git_command.git_require(min_git_version_soft):
@@ -368,13 +365,13 @@ to update the working directory files.
         # Handle new --repo-rev requests.
         if opt.repo_rev:
             try:
-                remote_ref, rev = wrapper.check_repo_rev(
+                remote_ref, rev = wrapper.Wrapper().check_repo_rev(
                     rp.worktree,
                     opt.repo_rev,
                     repo_verify=opt.repo_verify,
                     quiet=opt.quiet,
                 )
-            except wrapper.CloneFailure as e:
+            except wrapper.Wrapper().CloneFailure as e:
                 err_msg = "fatal: double check your --repo-rev setting."
                 logger.error(err_msg)
                 self.git_event_log.ErrorEvent(err_msg)

subcmds/sync.py

@@ -76,7 +76,7 @@ from project import SyncBuffer
 import repo_logging
 import repo_trace
 import ssh
-from wrapper import Wrapper
+import wrapper
 
 
 _ONE_DAY_S = 24 * 60 * 60
@@ -3463,9 +3463,8 @@ def _PostRepoUpgrade(manifest, quiet=False):
         except Exception:
             pass
 
-    wrapper = Wrapper()
-    if wrapper.NeedSetupGnuPG():
-        wrapper.SetupGnuPG(quiet)
+    if wrapper.Wrapper().NeedSetupGnuPG():
+        wrapper.Wrapper().SetupGnuPG(quiet)
     for project in manifest.projects:
         if project.Exists:
             project.PostRepoUpgrade()
@@ -3474,12 +3473,11 @@ def _PostRepoUpgrade(manifest, quiet=False):
 def _PostRepoFetch(rp, repo_verify=True, verbose=False):
     if rp.HasChanges:
         logger.warning("info: A new version of repo is available")
-        wrapper = Wrapper()
         try:
             rev = rp.bare_git.describe(rp.GetRevisionId())
         except error.GitError:
             rev = None
-        _, new_rev = wrapper.check_repo_rev(
+        _, new_rev = wrapper.Wrapper().check_repo_rev(
             rp.gitdir, rev, repo_verify=repo_verify
         )
         # See if we're held back due to missing signed tag.

subcmds/version.py

@@ -20,7 +20,7 @@ from command import Command
 from command import MirrorSafeCommand
 import git_command
 import git_refs
-from wrapper import Wrapper
+import wrapper
 
 
 class Version(Command, MirrorSafeCommand):
@@ -81,4 +81,4 @@ class Version(Command, MirrorSafeCommand):
             print(f"OS {uname.system} {uname.release} ({uname.version})")
             processor = uname.processor if uname.processor else "unknown"
             print(f"CPU {uname.machine} ({processor})")
-        print("Bug reports:", Wrapper().BUG_URL)
+        print("Bug reports:", wrapper.Wrapper().BUG_URL)