Skip to content

Commit 3f457d6

Browse files
authored
Use absolute imports instead of relative imports (#640)
1 parent be3eb5e commit 3f457d6

File tree

20 files changed

+65
-70
lines changed

20 files changed

+65
-70
lines changed

skrobot/coordinates/__init__.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# flake8: noqa
22

3-
from .base import CascadedCoords
4-
from .base import Coordinates
5-
from .base import Transform
6-
from .base import make_coords
7-
from .base import make_cascoords
3+
from skrobot.coordinates.base import CascadedCoords
4+
from skrobot.coordinates.base import Coordinates
5+
from skrobot.coordinates.base import Transform
6+
from skrobot.coordinates.base import make_coords
7+
from skrobot.coordinates.base import make_cascoords
88

9-
from .geo import convert_to_axis_vector
10-
from .geo import midcoords
11-
from .geo import midpoint
12-
from .geo import orient_coords_to_axis
13-
from .geo import rotate_points
9+
from skrobot.coordinates.geo import convert_to_axis_vector
10+
from skrobot.coordinates.geo import midcoords
11+
from skrobot.coordinates.geo import midpoint
12+
from skrobot.coordinates.geo import orient_coords_to_axis
13+
from skrobot.coordinates.geo import rotate_points
1414

15-
from .math import matrix2quaternion
16-
from .math import quaternion2rpy
17-
from .math import make_matrix
18-
from .math import manipulability
19-
from .math import normalize_vector
20-
from .math import rpy_angle
21-
from .math import rpy_matrix
22-
from .math import sr_inverse
15+
from skrobot.coordinates.math import matrix2quaternion
16+
from skrobot.coordinates.math import quaternion2rpy
17+
from skrobot.coordinates.math import make_matrix
18+
from skrobot.coordinates.math import manipulability
19+
from skrobot.coordinates.math import normalize_vector
20+
from skrobot.coordinates.math import rpy_angle
21+
from skrobot.coordinates.math import rpy_matrix
22+
from skrobot.coordinates.math import sr_inverse

skrobot/interfaces/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ def __getattr__(name):
3333
raise AttributeError(f"module 'skrobot.interfaces' has no attribute '{name}'")
3434

3535

36-
from .ros import *
36+
from skrobot.interfaces.ros import *

skrobot/interfaces/ros/move_base.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
from skrobot.coordinates import Coordinates
1515
from skrobot.coordinates.math import rotate_vector
1616
from skrobot.coordinates.math import rotation_distance
17-
18-
from .base import ROSRobotInterfaceBase
19-
from .tf_utils import coords_to_geometry_pose
20-
from .tf_utils import geometry_pose_to_coords
21-
from .tf_utils import tf_pose_to_coords
22-
from .transform_listener import TransformListener
17+
from skrobot.interfaces.ros.base import ROSRobotInterfaceBase
18+
from skrobot.interfaces.ros.tf_utils import coords_to_geometry_pose
19+
from skrobot.interfaces.ros.tf_utils import geometry_pose_to_coords
20+
from skrobot.interfaces.ros.tf_utils import tf_pose_to_coords
21+
from skrobot.interfaces.ros.transform_listener import TransformListener
2322

2423

2524
class ROSRobotMoveBaseInterface(ROSRobotInterfaceBase):

skrobot/interfaces/ros/nextage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import rospy
44
import trajectory_msgs.msg
55

6-
from .base import ROSRobotInterfaceBase
6+
from skrobot.interfaces.ros.base import ROSRobotInterfaceBase
77

88

99
class NextageROSRobotInterface(ROSRobotInterfaceBase):

skrobot/interfaces/ros/panda.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import control_msgs.msg
33
import franka_gripper.msg
44

5-
from .base import ROSRobotInterfaceBase
5+
from skrobot.interfaces.ros.base import ROSRobotInterfaceBase
66

77

88
WIDTH_MAX = 0.08

skrobot/interfaces/ros/pr2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import pr2_controllers_msgs.msg
77
import rospy
88

9-
from ...model import RotationalJoint
10-
from .move_base import ROSRobotMoveBaseInterface
9+
from skrobot.interfaces.ros.move_base import ROSRobotMoveBaseInterface
10+
from skrobot.model import RotationalJoint
1111

1212

1313
class PR2ROSRobotInterface(ROSRobotMoveBaseInterface):
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .base import ROS2RobotInterfaceBase
2-
from .panda import PandaROS2RobotInterface
1+
from skrobot.interfaces.ros2.base import ROS2RobotInterfaceBase
2+
from skrobot.interfaces.ros2.panda import PandaROS2RobotInterface
33

44

55
__all__ = ['ROS2RobotInterfaceBase', 'PandaROS2RobotInterface']

skrobot/interfaces/ros2/panda.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import rclpy
33
from rclpy.action import ActionClient
44

5-
from .base import ROS2RobotInterfaceBase
5+
from skrobot.interfaces.ros2.base import ROS2RobotInterfaceBase
66

77

88
try:

skrobot/models/fetch.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
from skrobot.coordinates import CascadedCoords
55
from skrobot.data import fetch_urdfpath
66
from skrobot.model import RobotModel
7-
8-
from .urdf import RobotModelFromURDF
7+
from skrobot.models.urdf import RobotModelFromURDF
98

109

1110
class Fetch(RobotModelFromURDF):

skrobot/models/kuka.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
from skrobot.coordinates import CascadedCoords
55
from skrobot.data import kuka_urdfpath
66
from skrobot.model import RobotModel
7-
8-
from .urdf import RobotModelFromURDF
7+
from skrobot.models.urdf import RobotModelFromURDF
98

109

1110
class Kuka(RobotModelFromURDF):

0 commit comments

Comments
 (0)