switch to pathlib instead os.path

ArduPilot · Feb 6, 2024 · 89f9797 · 89f9797
1 parent f49f444
commit 89f9797
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/ardupilot_gz_bringup/launch/iris_maze.launch.py b/ardupilot_gz_bringup/launch/iris_maze.launch.py
@@ -30,7 +30,7 @@
 # limitations under the License.
 
 """Launch an iris quadcopter in Gazebo and Rviz."""
-import os
+from pathlib import Path
 
 from ament_index_python.packages import get_package_share_directory
 
@@ -71,17 +71,17 @@ def generate_launch_description():
     # Gazebo.
     gz_sim_server = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(
-            os.path.join(pkg_ros_gz_sim, "launch", "gz_sim.launch.py")
+            f'{Path(pkg_ros_gz_sim) / "launch" / "gz_sim.launch.py"}'
         ),
         launch_arguments={
             "gz_args": "-v4 -s -r "
-            + os.path.join(pkg_project_gazebo, "worlds", "iris_maze.sdf")
+            + f'{Path(pkg_project_gazebo) / "worlds" / "iris_maze.sdf"}'
         }.items(),
     )
 
     gz_sim_gui = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(
-            os.path.join(pkg_ros_gz_sim, "launch", "gz_sim.launch.py")
+            f'{Path(pkg_ros_gz_sim) / "launch" / "gz_sim.launch.py"}'
         ),
         launch_arguments={"gz_args": "-v4 -g"}.items(),
     )
@@ -92,7 +92,7 @@ def generate_launch_description():
         executable="rviz2",
         arguments=[
             "-d",
-            os.path.join(pkg_project_bringup, "rviz", "iris_with_lidar.rviz"),
+            f'{Path(pkg_project_bringup) / "rviz" / "iris_with_lidar.rviz"}',
         ],
         condition=IfCondition(LaunchConfiguration("rviz")),
     )

diff --git a/ardupilot_gz_bringup/launch/iris_runway.launch.py b/ardupilot_gz_bringup/launch/iris_runway.launch.py
@@ -30,7 +30,7 @@
 # limitations under the License.
 
 """Launch an iris quadcopter in Gazebo and Rviz."""
-import os
+from pathlib import Path
 
 from ament_index_python.packages import get_package_share_directory
 
@@ -71,17 +71,17 @@ def generate_launch_description():
     # Gazebo.
     gz_sim_server = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(
-            os.path.join(pkg_ros_gz_sim, "launch", "gz_sim.launch.py")
+            f'{Path(pkg_ros_gz_sim) / "launch" / "gz_sim.launch.py"}'
         ),
         launch_arguments={
             "gz_args": "-v4 -s -r "
-            + os.path.join(pkg_project_gazebo, "worlds", "iris_runway.sdf")
+            f'{Path(pkg_project_gazebo) / "worlds" / "iris_runway.sdf"}'
         }.items(),
     )
 
     gz_sim_gui = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(
-            os.path.join(pkg_ros_gz_sim, "launch", "gz_sim.launch.py")
+            f'{Path(pkg_ros_gz_sim) / "launch" / "gz_sim.launch.py"}'
         ),
         launch_arguments={"gz_args": "-v4 -g"}.items(),
     )
@@ -90,7 +90,7 @@ def generate_launch_description():
     rviz = Node(
         package="rviz2",
         executable="rviz2",
-        arguments=["-d", os.path.join(pkg_project_bringup, "rviz", "iris.rviz")],
+        arguments=["-d", f'{Path(pkg_project_bringup) / "rviz" / "iris.rviz"}'],
         condition=IfCondition(LaunchConfiguration("rviz")),
     )
 

diff --git a/ardupilot_gz_bringup/launch/wildthumper_playpen.launch.py b/ardupilot_gz_bringup/launch/wildthumper_playpen.launch.py
@@ -30,7 +30,7 @@
 # limitations under the License.
 
 """Launch a wildthumper rover in the playpen world."""
-import os
+from pathlib import Path
 
 from ament_index_python.packages import get_package_share_directory
 
@@ -71,17 +71,17 @@ def generate_launch_description():
     # Gazebo.
     gz_sim_server = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(
-            os.path.join(pkg_ros_gz_sim, "launch", "gz_sim.launch.py")
+            f'{Path(pkg_ros_gz_sim) / "launch" / "gz_sim.launch.py"}'
         ),
         launch_arguments={
             "gz_args": "-v4 -s -r "
-            + os.path.join(pkg_project_gazebo, "worlds", "wildthumper_playpen.sdf")
+            f'{Path(pkg_project_gazebo) / "worlds" / "wildthumper_playpen.sdf"}'
         }.items(),
     )
 
     gz_sim_gui = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(
-            os.path.join(pkg_ros_gz_sim, "launch", "gz_sim.launch.py")
+            f'{Path(pkg_ros_gz_sim) / "launch" / "gz_sim.launch.py"}'
         ),
         launch_arguments={"gz_args": "-v4 -g"}.items(),
     )
@@ -90,7 +90,7 @@ def generate_launch_description():
     rviz = Node(
         package="rviz2",
         executable="rviz2",
-        arguments=["-d", os.path.join(pkg_project_bringup, "rviz", "wildthumper.rviz")],
+        arguments=["-d", f'{Path(pkg_project_bringup) / "rviz" / "wildthumper.rviz"}'],
         condition=IfCondition(LaunchConfiguration("rviz")),
     )