Merge pull request #307 from compas-dev/repr_fixes

Fixed reprs following compas release

Author: beverlylytle

CHANGELOG.rst

@@ -14,6 +14,8 @@ Unreleased
 
 **Changed**
 
+* Made consistent use of ``repr`` in nested objects
+
 **Fixed**
 
 * Fixed bug in ``compas.backends.PyBulletClient.convert_mesh_to_body`` circumventing PyBullet's propensity to cache

docs/examples/03_backends_ros/files/03_forward_kinematics_urdf.py

@@ -9,4 +9,4 @@
 print("Frame in the world coordinate system")
 print(frame_WCF)
 
-assert str(frame_WCF.point) == 'Point(0.300, 0.100, 0.500)'
+assert repr(frame_WCF.point) == 'Point(0.300, 0.100, 0.500)'

src/compas_fab/backends/ros/messages/direct_ur.py

@@ -10,11 +10,7 @@ def __init__(self, **kwargs):
             setattr(self, k, v)
 
     def __str__(self):
-        result = ""
-        for key, value in self.__dict__.items():
-            if value:
-                result += "%s, " % value
-        return result[:-2]
+        return ", ".join(["{!r}" for value in self.__dict__.values() if value])
 
     def __repr__(self):
         return self.__str__

src/compas_fab/robots/constraints.py

@@ -155,7 +155,7 @@ def transform(self, transformation):
 
     def __repr__(self):
         """Printable representation of :class:`BoundingVolume`."""
-        return "BoundingVolume({0}, {1})".format(self.type, self.volume)
+        return "BoundingVolume({!r}, {!r})".format(self.type, self.volume)
 
     def copy(self):
         """Make a copy of this :class:`BoundingVolume`.
@@ -307,7 +307,7 @@ def scale(self, scale_factor):
 
     def __repr__(self):
         """Printable representation of :class:`JointConstraint`."""
-        return "JointConstraint('{0}', {1}, {2}, {3}, {4})".format(self.joint_name, self.value, self.tolerance_above, self.tolerance_below, self.weight)
+        return "JointConstraint({!r}, {!r}, {!r}, {!r}, {!r})".format(self.joint_name, self.value, self.tolerance_above, self.tolerance_below, self.weight)
 
     def copy(self):
         """Create a copy of this :class:`JointConstraint`.
@@ -392,7 +392,7 @@ def transform(self, transformation):
 
     def __repr__(self):
         """Printable representation of :class:`OrientationConstraint`."""
-        return "OrientationConstraint('{0}', {1}, {2}, {3})".format(self.link_name, self.quaternion, self.tolerances, self.weight)
+        return "OrientationConstraint({!r}, {!r}, {!r}, {!r})".format(self.link_name, self.quaternion, self.tolerances, self.weight)
 
     def copy(self):
         """Create a copy of this :class:`OrientationConstraint`.
@@ -550,7 +550,7 @@ def transform(self, transformation):
 
     def __repr__(self):
         """Printable representation of :class:`PositionConstraint`."""
-        return "PositionConstraint('{0}', {1}, {2})".format(self.link_name, self.bounding_volume, self.weight)
+        return "PositionConstraint({!r}, {!r}, {!r})".format(self.link_name, self.bounding_volume, self.weight)
 
     def copy(self):
         """Create a copy of this :class:`PositionConstraint`.

src/compas_fab/robots/inertia.py

@@ -51,7 +51,7 @@ def principal_moments(self):
         return [inertia_tensor[0][0], inertia_tensor[1][1], inertia_tensor[2][2]]
 
     def __repr__(self):
-        return "Inertia({0}, {1}, {2})".format(self.inertia_tensor, self.mass, self.center_of_mass)
+        return "Inertia({!r}, {!r}, {!r})".format(self.inertia_tensor, self.mass, self.center_of_mass)
 
     @staticmethod
     def calculate_inertia_tensor(cls, mesh):

src/compas_fab/robots/time_.py

@@ -23,7 +23,7 @@ def __init__(self, secs, nsecs):
         self.nsecs = int(nsecs)
 
     def __str__(self):
-        return 'Duration({}, {})'.format(self.secs, self.nsecs)
+        return 'Duration({!r}, {!r})'.format(self.secs, self.nsecs)
 
     def __repr__(self):
         return self.__str__()

src/compas_fab/robots/wrench.py

@@ -186,7 +186,7 @@ def __getitem__(self, item):
     # ==========================================================================
 
     def __repr__(self):
-        return "Wrench({0}, {1})".format(self.force, self.torque)
+        return "Wrench({!r}, {!r})".format(self.force, self.torque)
 
     # ==========================================================================
     # helpers