tweak stdlib imports to follow Google style guide

Google Python style guide says to import modules.
Clean up all our stdlib imports.  Leave the repo ones alone
for now as that's a much bigger shave.

Change-Id: Ida42fc2ae78b86e6b7a6cbc98f94ca04b295f8cc
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/383714
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Mike Frysinger <vapier@google.com>
Tested-by: Mike Frysinger <vapier@google.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/subcmds/abandon.py b/subcmds/abandon.py
index 896b348f..1499c75e 100644
--- a/subcmds/abandon.py
+++ b/subcmds/abandon.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from collections import defaultdict
+import collections
 import functools
 import itertools
 import sys
@@ -88,8 +88,8 @@ It is equivalent to "git branch -D <branchname>".
 
     def Execute(self, opt, args):
         nb = args[0].split()
-        err = defaultdict(list)
-        success = defaultdict(list)
+        err = collections.defaultdict(list)
+        success = collections.defaultdict(list)
         aggregate_errors = []
         all_projects = self.GetProjects(
             args[1:], all_manifests=not opt.this_manifest_only
diff --git a/subcmds/selfupdate.py b/subcmds/selfupdate.py
index 00376b66..983fd630 100644
--- a/subcmds/selfupdate.py
+++ b/subcmds/selfupdate.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from optparse import SUPPRESS_HELP
+import optparse
 import sys
 
 from command import Command, MirrorSafeCommand
@@ -52,7 +52,7 @@ need to be performed by an end-user.
             "--repo-upgraded",
             dest="repo_upgraded",
             action="store_true",
-            help=SUPPRESS_HELP,
+            help=optparse.SUPPRESS_HELP,
         )
 
     def Execute(self, opt, args):
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 159771eb..74bc4557 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -19,7 +19,7 @@ import io
 import json
 import multiprocessing
 import netrc
-from optparse import SUPPRESS_HELP
+import optparse
 import os
 import socket
 import sys
@@ -481,7 +481,7 @@ later is required to fix a server side protocol bug.
             "--repo-upgraded",
             dest="repo_upgraded",
             action="store_true",
-            help=SUPPRESS_HELP,
+            help=optparse.SUPPRESS_HELP,
         )
 
     def _GetBranch(self, manifest_project):