commit c5be50580d4182f5fc50c74cd6e20e2c39540812
author Doron Tsur <tsurd2@gmail.com> Tue Mar 31 21:52:35 2020 +0300
committer Bill Yang <yangbill@google.com> Tue Apr 07 10:37:41 2020 +0000
tree 22d1c569022d5e5ac7782d28f2fea8a45ee89603
parent d8eacae9cfb90ed67d6760d842a962d9cf1bb7a4

[Python2 Migrate] Enabling developer offline modes

Reduced scope for 2 corner case dependencies
- distutils : util
- urllib.request : urlopen

Test: repo_run$ m atest ; atest-dev inputflinger_tests
Test: repo_run$ atest-dev -h

Signed-off-by: Doron Tsur <tsurd2@gmail.com>
Change-Id: I11719f511a57123a6064c5e8fb4ff59f7f953b65

atest/atest_utils.py

diff --git a/atest/atest_utils.py b/atest/atest_utils.py
index 9a7178e..f1be007 100644
--- a/atest/atest_utils.py
+++ b/atest/atest_utils.py
@@ -16,6 +16,7 @@
 Utility functions for atest.
 """
 
+
 from __future__ import print_function
 
 import hashlib
@@ -36,13 +37,6 @@
 from metrics import metrics_base
 from metrics import metrics_utils
 
-try:
-    # If PYTHON2
-    from urllib2 import urlopen
-except ImportError:
-    metrics_utils.handle_exc_and_send_exit_event(
-        constants.IMPORT_FAILURE)
-    from urllib.request import urlopen
 
 _BASH_RESET_CODE = '\033[0m\n'
 # Arbitrary number to limit stdout for failed runs in _run_limited_output.
@@ -204,6 +198,13 @@
     # TODO: Also check if we have a slow connection to result server.
     if constants.RESULT_SERVER:
         try:
+            try:
+                # If PYTHON2
+                from urllib2 import urlopen
+            except ImportError:
+                metrics_utils.handle_exc_and_send_exit_event(
+                    constants.IMPORT_FAILURE)
+                from urllib.request import urlopen
             urlopen(constants.RESULT_SERVER,
                     timeout=constants.RESULT_SERVER_TIMEOUT).close()
             return True