commit 2ab29cc5fd1440973d590447615072add592f525
author Alex Klein <saklein@chromium.org> Thu Jul 19 12:01:00 2018 -0600
committer chrome-bot <chrome-bot@chromium.org> Fri Jul 20 18:33:59 2018 -0700
tree f0fbee122b9b47716867bf7b5df0eb44385a2c8a
parent c265b743ecc949d1ab2f65b6fe602d26264abc21

Replaced most site_config.params usages with new direct access.

BUG=chromium:795449
TEST=run_tests

Change-Id: Icb7d9700fa8c1b77ef97bf47fb1e096baa09da36
Reviewed-on: https://chromium-review.googlesource.com/1144202
Commit-Ready: Alex Klein <saklein@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/gerrit.py

diff --git a/scripts/gerrit.py b/scripts/gerrit.py
index c7f4c27..b859e40 100644
--- a/scripts/gerrit.py
+++ b/scripts/gerrit.py
@@ -30,9 +30,6 @@
 from chromite.lib import uri_lib
 
 
-site_config = config_lib.GetConfig()
-
-
 # Locate actions that are exposed to the user.  All functions that start
 # with "UserAct" are fair game.
 ACTION_PREFIX = 'UserAct'
@@ -95,7 +92,7 @@
   gob = opts.gob
   if cl is not None:
     if cl.startswith('*'):
-      gob = site_config.params.INTERNAL_GOB_INSTANCE
+      gob = config_lib.GetSiteParams().INTERNAL_GOB_INSTANCE
       cl = cl[1:]
     elif ':' in cl:
       gob, cl = cl.split(':', 1)
@@ -161,11 +158,12 @@
 def PrintCls(opts, cls, lims=None, show_approvals=True):
   """Print all results based on the requested format."""
   if opts.raw:
+    site_params = config_lib.GetSiteParams()
     pfx = ''
     # Special case internal Chrome GoB as that is what most devs use.
     # They can always redirect the list elsewhere via the -g option.
-    if opts.gob == site_config.params.INTERNAL_GOB_INSTANCE:
-      pfx = site_config.params.INTERNAL_CHANGE_PREFIX
+    if opts.gob == site_params.INTERNAL_GOB_INSTANCE:
+      pfx = site_params.INTERNAL_CHANGE_PREFIX
     for cl in cls:
       print('%s%s' % (pfx, cl['number']))
 
@@ -545,15 +543,16 @@
                          (cmd, cmd.lower().capitalize()))
     usage += '\n  %-*s: %s' % (indent, cmd.lower(), globals()[a].__doc__)
 
+  site_params = config_lib.GetSiteParams()
   parser = commandline.ArgumentParser(usage=usage)
   parser.add_argument('-i', '--internal', dest='gob', action='store_const',
-                      default=site_config.params.EXTERNAL_GOB_INSTANCE,
-                      const=site_config.params.INTERNAL_GOB_INSTANCE,
+                      default=site_params.EXTERNAL_GOB_INSTANCE,
+                      const=site_params.INTERNAL_GOB_INSTANCE,
                       help='Query internal Chromium Gerrit instance')
   parser.add_argument('-g', '--gob',
-                      default=site_config.params.EXTERNAL_GOB_INSTANCE,
+                      default=site_params.EXTERNAL_GOB_INSTANCE,
                       help=('Gerrit (on borg) instance to query (default: %s)' %
-                            (site_config.params.EXTERNAL_GOB_INSTANCE)))
+                            (site_params.EXTERNAL_GOB_INSTANCE)))
   parser.add_argument('--sort', default='number',
                       help='Key to sort on (number, project); use "unsorted" '
                            'to disable')