swarming: Reload the google py library after initializing a bot's path.

appengine/swarming/swarming_bot/__main__.py

 # Copyright 2014 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Runs either task_runner.py, bot_main.py or bot_config.py.
 
 The imports are done late so if an ImportError occurs, it is localized to this
 command only.
 """
 
@@ skipping 17 matching lines @@
 
 # libusb1 expects to be directly in sys.path.
 sys.path.insert(0, os.path.join(THIS_FILE, 'python_libusb1'))
 
 # Copied from //client/utils/oauth.py.
 sys.path.insert(0, os.path.join(THIS_FILE, 'third_party'))
 sys.path.insert(0, os.path.join(THIS_FILE, 'third_party', 'pyasn1'))
 sys.path.insert(0, os.path.join(THIS_FILE, 'third_party', 'pyasn1-modules'))
 sys.path.insert(0, os.path.join(THIS_FILE, 'third_party', 'rsa'))
 
+# The google library can occasionally get imported prior to the path
+# maipulation above. If this happens, reload the module to pick up the version
+# packaged in the bot_code in third_party.
+path_to_zip = os.path.dirname(os.path.realpath(__file__))
+path_to_google = os.path.join(path_to_zip, 'third_party', 'google')
+import google
+if google.__path__[0] != path_to_google:
+  google = reload(google)
+
 from bot_code import common
 
 
 # TODO(maruel): Use depot_tools/subcommand.py. The goal here is to have all the
 # sub commands packed into the single .zip file as a swiss army knife (think
 # busybox but worse).
 
 
 def CMDattributes(_args):
   """Prints out the bot's attributes."""
@@ skipping 191 matching lines @@
       with zipfile.ZipFile(THIS_FILE, 'r') as f:
         logging.error('Files in %s:\n%s', THIS_FILE, f.namelist())
       return 1
 
   print >> sys.stderr, 'Unknown command %s' % cmd
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())