Catch OSError *and* socket.error in camera client

uilibs · Feb 23, 2016 · 238ab51 · 238ab51
1 parent f4a6b2b
commit 238ab51
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/uvcclient/camera.py b/uvcclient/camera.py
@@ -14,6 +14,7 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
+import socket
 
 # Python3 compatibility
 try:
@@ -49,7 +50,7 @@ def _safe_request(self, *args, **kwargs):
             conn = httplib.HTTPConnection(self._host, self._port)
             conn.request(*args, **kwargs)
             return conn.getresponse()
-        except OSError:
+        except (socket.error, OSError):
             raise CameraConnectError('Unable to contact camera')
         except httplib.HTTPException as ex:
             raise CameraConnectError('Error connecting to camera: %s' % (