From a8638660207331f7d4713b81cfb757e95ef56670 Mon Sep 17 00:00:00 2001
From: Fabian Schramm <55981657+fabinsch@users.noreply.github.com>
Date: Fri, 12 May 2023 17:39:36 +0200
Subject: [PATCH] move import of paths
- always try to import EXAMPLE_ROBOT_DATA_MODEL_DIR and EXAMPLE_ROBOT_DATA_SOURCE_DIR
---
python/example_robot_data/robots_loader.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/python/example_robot_data/robots_loader.py b/python/example_robot_data/robots_loader.py
index 36f4529..76e9de4 100644
--- a/python/example_robot_data/robots_loader.py
+++ b/python/example_robot_data/robots_loader.py
@@ -5,6 +5,10 @@ import numpy as np
import pinocchio as pin
from pinocchio.robot_wrapper import RobotWrapper
+try:
+ from .path import EXAMPLE_ROBOT_DATA_MODEL_DIR, EXAMPLE_ROBOT_DATA_SOURCE_DIR
+except ImportError:
+ pass
def getModelPath(subpath, printmsg=False):
source = dirname(dirname(dirname(__file__))) # top level source directory
@@ -17,13 +21,13 @@ def getModelPath(subpath, printmsg=False):
join(source, "robots"),
]
try:
- from .path import EXAMPLE_ROBOT_DATA_MODEL_DIR, EXAMPLE_ROBOT_DATA_SOURCE_DIR
+ EXAMPLE_ROBOT_DATA_MODEL_DIR
# function called from installed project
paths.append(EXAMPLE_ROBOT_DATA_MODEL_DIR)
# function called from off-tree build dir
paths.append(EXAMPLE_ROBOT_DATA_SOURCE_DIR)
- except ImportError:
+ except NameError:
pass
paths += [join(p, "../../../share/example-robot-data/robots") for p in sys.path]
for path in paths:
--
GitLab