Skip to content

Commit

Permalink
Improve exception handling and remove unnecessary else
Browse files Browse the repository at this point in the history
  • Loading branch information
flferretti committed Apr 24, 2024
1 parent cf0f628 commit 04b61a4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/rod/sdf/element.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def deserialize_bool(data: str) -> bool:
false_vals = {"0", "False", "false"}
assert data in true_vals.union(false_vals)

return True if data in true_vals else False
return data in true_vals

@staticmethod
def serialize_float(data: float) -> str:
Expand Down
4 changes: 2 additions & 2 deletions src/rod/sdf/sdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ def load(sdf: Union[pathlib.Path, str], is_urdf: Optional[bool] = None) -> Sdf:
# Parse the SDF to dict
try:
xml_dict = xmltodict.parse(xml_input=sdf_string)
except Exception:
raise ValueError("Failed to parse 'sdf' argument")
except Exception as exc:
raise exc("Failed to parse 'sdf' argument")

# Look for the top-level <sdf> element
try:
Expand Down
8 changes: 4 additions & 4 deletions src/rod/tree/tree_elements.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ class DirectedTreeNode(TreeElement):
parent: Optional[DirectedTreeNode] = None
children: List[DirectedTreeNode] = dataclasses.field(default_factory=list)

_source: Optional["rod.Link"] = dataclasses.field(default=None, repr=False)
_source: Optional[rod.Link] = dataclasses.field(default=None, repr=False)

def name(self) -> str:
return self._source.name

def pose(self) -> "rod.Pose":
def pose(self) -> rod.Pose:
if self._source is not None and self._source.pose is not None:
return self._source.pose
else:
return rod.Pose(relative_to="world")

return rod.Pose(relative_to="world")

@property
def tree_label(self) -> str:
Expand Down
1 change: 1 addition & 0 deletions src/rod/utils/gazebo.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ def process_model_description_with_sdformat(
text=True,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
check=True,
)

if cp.returncode != 0:
Expand Down

0 comments on commit 04b61a4

Please sign in to comment.