Extract authentication options handling into a separate function.

gcl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
 import json
 import optparse
 import os
 import random
 import re
 import ssl
 import string
 import sys
 import tempfile
 import time
 import urllib2
 
 import breakpad  # pylint: disable=W0611
 
 
+import auth
 import fix_encoding
 import gclient_utils
 import git_cl
 import presubmit_support
 import rietveld
 from scm import SVN
 import subprocess2
 from third_party import upload
 
 __version__ = '1.2.1'
@@ skipping 308 matching lines @@
     gclient_utils.FileWrite(GetChangelistInfoFile(self.name), data)
 
   def Delete(self):
     """Removes the changelist information from disk."""
     os.remove(GetChangelistInfoFile(self.name))
 
   def RpcServer(self):
     if not self._rpc_server:
       if not self.rietveld:
         ErrorExit(CODEREVIEW_SETTINGS_FILE_NOT_FOUND)
-      self._rpc_server = rietveld.CachingRietveld(self.rietveld, None, None)
+      # TODO(vadimsh): glc.py should be deleted soon. Do not bother much about
+      # authentication options and always use defaults.
+      self._rpc_server = rietveld.CachingRietveld(
+          self.rietveld, auth.make_auth_config())
     return self._rpc_server
 
   def CloseIssue(self):
     """Closes the Rietveld issue for this changelist."""
     # Newer versions of Rietveld require us to pass an XSRF token to POST, so
     # we fetch it from the server.
     xsrf_token = self.SendToRietveld(
         '/xsrf_token',
         extra_headers={'X-Requesting-XSRF-Token': '1'})
 
@@ skipping 1093 matching lines @@
         for fn in dir(sys.modules[__name__]) if fn.startswith('CMD')]))
   return 0
 
 
 def main(argv):
   if sys.hexversion < 0x02060000:
     print >> sys.stderr, (
         '\nYour python version %s is unsupported, please upgrade.\n' %
         sys.version.split(' ', 1)[0])
     return 2
+
+  sys.stderr.write('Warning: gcl is going away soon. Get off subversion!\n')
+  sys.stderr.write('See http://crbug.com/475321 for more details.\n')
+
   if not argv:
     argv = ['help']
   command = Command(argv[0])
   # Help can be run from anywhere.
   if command == CMDhelp:
     return command(argv[1:])
 
   try:
     GetRepositoryRoot()
   except (gclient_utils.Error, subprocess2.CalledProcessError):
@@ skipping 31 matching lines @@
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)