gmail_lib: fix import order
BUG=chromium:622988
TEST=On .hot, remove the silencing of the import error, then run
gmail_lib as script. With this fix applied, gmail_lib doesn't fail with
import error but instead is able to send email.
Change-Id: I23b89d0d9d5ad6885409f46f386f7522a3464f43
Reviewed-on: https://chromium-review.googlesource.com/356070
Tested-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>
Trybot-Ready: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Dan Shi <dshi@google.com>
diff --git a/site_utils/gmail_lib.py b/site_utils/gmail_lib.py
index 4d3d459..3917deb 100755
--- a/site_utils/gmail_lib.py
+++ b/site_utils/gmail_lib.py
@@ -27,8 +27,6 @@
import common
from autotest_lib.client.common_lib import global_config
from autotest_lib.client.common_lib.cros.graphite import autotest_stats
-from autotest_lib.server import utils as server_utils
-from chromite.lib import retry_util
try:
from apiclient.discovery import build as apiclient_build
@@ -38,6 +36,11 @@
apiclient_build = None
logging.debug("API client for gmail disabled. %s", e)
+# TODO(akeshet) These imports needs to come after the apiclient imports, because
+# of a sys.path war between chromite and autotest crbug.com/622988
+from autotest_lib.server import utils as server_utils
+from chromite.lib import retry_util
+
EMAIL_COUNT_KEY = 'emails.%s'
DEFAULT_CREDS_FILE = global_config.global_config.get_config_value(