Skip to content

Commit 4d0f581

Browse files
committedJun 25, 2020
Ordering of imports
1 parent 85bda5d commit 4d0f581

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed
 

‎carla_common/setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"""
44

55
import os
6-
76
ROS_VERSION = int(os.environ['ROS_VERSION'])
87

98
if ROS_VERSION == 1:

‎carla_common/src/carla_common/transforms.py

+5-8
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
Tool functions to convert transforms from carla to ROS coordinate system
1111
"""
1212

13+
from ros_compatibility import euler_matrix, quaternion_from_euler
1314
import math
14-
import os
15-
1615
import numpy
17-
from geometry_msgs.msg import Vector3, Quaternion, Transform, Pose, Point, Twist, Accel
1816

19-
from ros_compatibility import euler_matrix, quaternion_from_euler
17+
from geometry_msgs.msg import Vector3, Quaternion, Transform, Pose, Point, Twist, Accel
2018

19+
import os
2120
ROS_VERSION = int(os.environ.get('ROS_VERSION', 0))
2221

2322

@@ -207,8 +206,7 @@ def carla_vector_to_ros_vector_rotated(carla_vector, carla_rotation):
207206
return ros_vector
208207

209208

210-
def carla_velocity_to_ros_twist(carla_linear_velocity, carla_angular_velocity,
211-
carla_rotation=None):
209+
def carla_velocity_to_ros_twist(carla_linear_velocity, carla_angular_velocity, carla_rotation=None):
212210
"""
213211
Convert a carla velocity to a ROS twist
214212
@@ -226,8 +224,7 @@ def carla_velocity_to_ros_twist(carla_linear_velocity, carla_angular_velocity,
226224
"""
227225
ros_twist = Twist()
228226
if carla_rotation:
229-
ros_twist.linear = carla_vector_to_ros_vector_rotated(carla_linear_velocity,
230-
carla_rotation)
227+
ros_twist.linear = carla_vector_to_ros_vector_rotated(carla_linear_velocity, carla_rotation)
231228
else:
232229
ros_twist.linear = carla_location_to_ros_vector3(carla_linear_velocity)
233230
ros_twist.angular.x = math.radians(carla_angular_velocity.x)

‎carla_ros_bridge/src/carla_ros_bridge/camera.py

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ def _build_camera_info(self):
8585
camera_info.R = [1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0]
8686
camera_info.P = [fx, 0.0, cx, 0.0, 0.0, fy, cy, 0.0, 0.0, 0.0, 1.0, 0.0]
8787
elif ROS_VERSION == 2:
88+
# pylint: disable=assigning-non-slot
8889
camera_info.k = [fx, 0.0, cx, 0.0, fy, cy, 0.0, 0.0, 1.0]
8990
camera_info.d = [0.0, 0.0, 0.0, 0.0, 0.0]
9091
camera_info.r = [1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0]

‎carla_ros_bridge/src/carla_ros_bridge/lidar.py

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
from __future__ import print_function
1414

15+
import sys
1516
import ctypes
1617
import os
1718
import struct

‎carla_ros_bridge/src/carla_ros_bridge/sensor.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
Classes to handle Carla sensors
1010
"""
1111

12+
import os
1213
from abc import abstractmethod
1314

1415
import carla_common.transforms as trans
@@ -21,7 +22,6 @@
2122
except ImportError:
2223
import Queue as queue
2324

24-
import os
2525

2626
ROS_VERSION = int(os.environ.get('ROS_VERSION', 0))
2727

‎carla_ros_bridge/src/carla_ros_bridge/walker.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
Classes to handle Carla pedestrians
1111
"""
1212

13+
from derived_object_msgs.msg import Object
1314
from carla import WalkerControl
1415
from carla_msgs.msg import CarlaWalkerControl
1516
from carla_ros_bridge.traffic_participant import TrafficParticipant
16-
from derived_object_msgs.msg import Object
1717

1818
from ros_compatibility import destroy_subscription
1919

0 commit comments

Comments
 (0)
Please sign in to comment.