commit 98e307b54b2e732f704526b4f833d82575eb8b7a
author Anand K Mistry <amistry@chromium.org> Tue May 26 10:42:38 2020 +1000
committer Commit Bot <commit-bot@chromium.org> Fri May 29 02:24:04 2020 +0000
tree 704507af350e04a2f10980fd26c2876d3b713759
parent a62af2362e813c565a9c5e865855b1f3d77f614a

remote: Restore some Python 2.7 support

The platform_GesturesRegressionTest autotest transitively imports this
module. Since autotest still runs under Python 2.7, this module needs to
work with that.

BUG=chromium:1065510
TEST='test_that <DUT> platform_GesturesRegressionTest' with follow-up
     fix to test passes

Cq-Depend: chromium:2214966
Change-Id: Iaab7b17dfe588b22a64f810f60f530d20ee9839b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/touch_firmware_test/+/2215541
Tested-by: Anand Mistry <amistry@chromium.org>
Reviewed-by: Sean O'Brien <seobrien@chromium.org>
Reviewed-by: Harry Cutts <hcutts@chromium.org>
Commit-Queue: Anand Mistry <amistry@chromium.org>

remote/remote_aardvark.py

diff --git a/remote/remote_aardvark.py b/remote/remote_aardvark.py
index d9bdb85..382e350 100644
--- a/remote/remote_aardvark.py
+++ b/remote/remote_aardvark.py
@@ -19,7 +19,10 @@
 
 import inspect
 import os
-import queue
+try:
+  import queue
+except ImportError:
+  import Queue as queue
 import re
 import select
 import sys