Update the Queue usage in _AdbPacketStore

adb_shell/hidden_helpers.py

@@ -53,9 +53,12 @@
 import struct
 
 try:
-    from queue import Queue
+    from asyncio import Queue
 except ImportError:  # pragma: no cover
-    from Queue import Queue
+    try:
+        from queue import Queue
+    except ImportError:
+        from Queue import Queue
 
 from . import constants
 
@@ -395,7 +398,7 @@ def get(self, arg0, arg1):
             arg0, arg1 = self.find(arg0, arg1)
 
         # Get the data from the queue
-        cmd, data = self._dict[arg1][arg0].get()
+        cmd, data = self._dict[arg1][arg0].get_nowait()
 
         # If this is a `CLSE` packet, then clear the entry in the store
         if cmd == constants.CLSE:
@@ -435,4 +438,4 @@ def put(self, arg0, arg1, cmd, data):
             self._dict[arg1] = {arg0: Queue()}
 
         # Put the data into the queue
-        self._dict[arg1][arg0].put((cmd, data))
+        self._dict[arg1][arg0].put_nowait((cmd, data))