From f656aaa7f5c4a1ff6d2059c334d35b6fa80a52c3 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 27 Jul 2022 19:28:07 +0200
Subject: [PATCH] socket.error is a subclass of OSError only in py3
---
src/gepetto/corbaserver/client.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gepetto/corbaserver/client.py b/src/gepetto/corbaserver/client.py
index 6f9be67..48c36b4 100644
--- a/src/gepetto/corbaserver/client.py
+++ b/src/gepetto/corbaserver/client.py
@@ -192,12 +192,13 @@ def _getIIOPurl(service="NameService", host=None, port=None):
try:
import rospy
+ import socket
# Check is ROS master is reachable.
if rospy.client.get_master().target is not None:
_host = rospy.get_param("/gepetto_viewer/host", _host)
_port = rospy.get_param("/gepetto_viewer/port", _port)
- except (ImportError, OSError):
+ except (ImportError, OSError, socket.error):
pass
_host = os.getenv("GEPETTO_VIEWER_HOST", _host)
_port = os.getenv("GEPETTO_VIEWER_PORT", _port)
--
GitLab