From c4f4d41cd22e1b0633c6ec0f6cbe7350762e5320 Mon Sep 17 00:00:00 2001
From: Andrea del Prete <adelprete@tuebingen.mpg.de>
Date: Fri, 26 Oct 2018 09:51:30 +0200
Subject: [PATCH] Switch to python 3
---
CMakeLists.txt | 2 +-
src/gepetto/__init__.py | 4 ++--
src/gepetto/corbaserver/__init__.py | 4 ++--
src/gepetto/corbaserver/client.py | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7abd3f..99f219f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ IF(NOT CLIENT_ONLY)
SET(BOOST_COMPONENTS system thread regex)
SEARCH_FOR_BOOST ()
- FINDPYTHON(2.7 EXACT)
+ FINDPYTHON(3 REQUIRED)
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
IF(USE_QT4)
diff --git a/src/gepetto/__init__.py b/src/gepetto/__init__.py
index 8ee9db8..79f1888 100644
--- a/src/gepetto/__init__.py
+++ b/src/gepetto/__init__.py
@@ -15,5 +15,5 @@
# hpp-corbaserver. If not, see
# <http://www.gnu.org/licenses/>.
-from color import Color
-from quaternion import Quaternion
+from gepetto.color import Color
+from gepetto.quaternion import Quaternion
diff --git a/src/gepetto/corbaserver/__init__.py b/src/gepetto/corbaserver/__init__.py
index 7b40fdd..0d49773 100644
--- a/src/gepetto/corbaserver/__init__.py
+++ b/src/gepetto/corbaserver/__init__.py
@@ -1,7 +1,7 @@
import omniORB
omniORB.updateModule("gepetto.corbaserver")
-import graphical_interface_idl
+import gepetto.corbaserver.graphical_interface_idl
-from client import Client
+from gepetto.corbaserver.client import Client
diff --git a/src/gepetto/corbaserver/client.py b/src/gepetto/corbaserver/client.py
index 9a6f051..a04b7cf 100644
--- a/src/gepetto/corbaserver/client.py
+++ b/src/gepetto/corbaserver/client.py
@@ -32,7 +32,7 @@ class Client:
try:
obj = self.rootContext.resolve (name)
- except CosNaming.NamingContext.NotFound, ex:
+ except CosNaming.NamingContext.NotFound:
raise CorbaError (
'failed to find the service ``{0}\'\''.format (serviceName [0]))
--
GitLab