Revert "gmail_lib: fix import order"
This reverts commit bd79b250d6048db1f8309afb17f7e052b5252cc1.
Change-Id: Ibe056741267beae8187d850f75e279930de2ea42
Reviewed-on: https://chromium-review.googlesource.com/356050
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
diff --git a/site_utils/gmail_lib.py b/site_utils/gmail_lib.py
index 63f20ff..4d3d459 100755
--- a/site_utils/gmail_lib.py
+++ b/site_utils/gmail_lib.py
@@ -27,6 +27,8 @@
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
@@ -34,12 +36,7 @@
from oauth2client import file as oauth_client_fileio
except ImportError as e:
apiclient_build = None
- logging("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
+ logging.debug("API client for gmail disabled. %s", e)
EMAIL_COUNT_KEY = 'emails.%s'
