Merge pull request #6 from eacousineau/feature/groovy-bugfixes

Small bugfixes for urdf_parser_py and xml_reflection
ros · Jul 25, 2013 · ba8d4de · ba8d4de
2 parents 35c22ec + 2942636
commit ba8d4de
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/urdf_parser_py/src/urdf_parser_py/urdf.py b/urdf_parser_py/src/urdf_parser_py/urdf.py
@@ -122,7 +122,7 @@ def __init__(self):
 			})
 
 	def from_xml(self, node):
-		children = node.getchildren()
+		children = xml_children(node)
 		assert len(children) == 1, 'One element only for geometric'
 		return self.factory.from_xml(children[0])
 
@@ -425,7 +425,7 @@ def from_parameter_server(cls, key = 'robot_description'):
 	xmlr.AggregateElement('link', Link),
 	xmlr.AggregateElement('joint', Joint),
 	xmlr.AggregateElement('gazebo', xmlr.RawType()),
-	xmlr.AggregateElement('transmission', Transmission),
+ 	xmlr.AggregateElement('transmission', Transmission),
 	xmlr.AggregateElement('material', Material)
 	])
 

diff --git a/xml_reflection/src/xml_reflection/__init__.pyc b/xml_reflection/src/xml_reflection/__init__.pyc
diff --git a/xml_reflection/src/xml_reflection/basics.py b/xml_reflection/src/xml_reflection/basics.py
@@ -42,7 +42,7 @@ def to_yaml(obj):
     # Ordered dict: http://pyyaml.org/ticket/29#comment:11
     if obj is None or type(obj) in [str, unicode]:
         out = str(obj)
-    elif type(obj) in [int, float]:
+    elif type(obj) in [int, float, bool]:
         return obj
     elif hasattr(obj, 'to_yaml'):
         out = obj.to_yaml()
@@ -52,6 +52,9 @@ def to_yaml(obj):
         out = {}
         for (var, value) in obj.iteritems():
             out[str(var)] = to_yaml(value)
+    elif hasattr(obj, 'tolist'):
+        # For numpy objects
+        out = to_yaml(obj.tolist())
     elif isinstance(obj, collections.Iterable):
         out = [to_yaml(item) for item in obj]
     else: