swarming: Roll py-adb to 75477ebf4fb8b906707f35e5fb385a9203256bef

appengine/third_party/python-adb/adb/common.py

 # Copyright 2014 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 322 matching lines @@
       device_matcher: See cls.FindDevices.
       **kwargs: See cls.FindDevices.
 
     Returns:
       An instance of UsbHandle.
 
     Raises:
       DeviceNotFoundError: Raised if the device is not available.
     """
     try:
-      return next(cls.FindDevices(
+      return next(cls.FindDevicesSafe(
           setting_matcher, device_matcher=device_matcher, **kwargs))
     except StopIteration:
       raise usb_exceptions.DeviceNotFoundError(
           'No device available, or it is in the wrong configuration.')
 
   @classmethod
   def FindDevices(cls, setting_matcher, device_matcher=None,
                   usb_info='', timeout_ms=None):
     """Find and yield the devices that match.
 
@@ skipping 12 matching lines @@
     for device in ctx.getDeviceList(skip_on_error=True):
       setting = setting_matcher(device)
       if setting is None:
         continue
 
       handle = cls(device, setting, usb_info=usb_info, timeout_ms=timeout_ms)
       if device_matcher is None or device_matcher(handle):
         yield handle
 
   @classmethod
-  def FindDevicesSafe(cls, *args, **kwargs):
-    """Safe version of FindDevicesSafe.
+  def FindDevicesSafe(cls, setting_matcher, device_matcher=None,
+                      usb_info='', timeout_ms=None):
+    """Safe version of FindDevices.
 
-    Use manual iterator handling instead of "for handle in generator" to catch
-    USB exception explicitly.
+    Like FindDevices, but catch USB exceptions as devices are iterated through.
+
+    Yields:
+      Unopened UsbHandle instances.
     """
-    generator = cls.FindDevices(*args, **kwargs)
-    while True:
-      try:
-        handle = generator.next()
-      except usb1.USBErrorOther as e:
-        logging.error(
-            'Failed to open USB device, is user in group plugdev? %s', e)
-        continue
-      yield handle
+    ctx = usb1.USBContext()
+    try:
+      for device in ctx.getDeviceList(skip_on_error=True):
+        setting = setting_matcher(device)
+        if setting is None:
+          continue
+
+        try:
+          handle = cls(device, setting, usb_info=usb_info,
+                       timeout_ms=timeout_ms)
+          if device_matcher is None or device_matcher(handle):
+            yield handle
+        except (usb1.USBErrorOther, usb1.USBErrorNoDevice) as e:
+          logging.error(
+              'Failed to open USB device, is user in group plugdev? %s', e)
+          continue
+    except usb1.USBError as e:
+      logging.error('Failed to get device list: %s', e)
 
 
 class TcpHandle(Handle):
   """TCP connection object.
 
      Provides same interface as UsbHandle."""
 
   def __init__(self, serial, timeout_ms=None):
     """Initialize the TCP Handle.
     Arguments:
@@ skipping 61 matching lines @@
           'Could not send data (timeout %sms)' % (self.Timeout(timeout_ms)), e)
 
   def BulkRead(self, length, timeout_ms=None):
     try:
       self._connection.settimeout(self.Timeout(timeout_ms) / 1000.0)
       return self._connection.recv(length)
     except socket.timeout as e:
       raise usb_exceptions.ReadFailedError(
           'Could not receive data (timeout %sms)' % (
               self.Timeout(timeout_ms)), e)