From 7518c170a405a3ca29c120fa350add0aef4c94a6 Mon Sep 17 00:00:00 2001 From: eacousineau Date: Thu, 11 Jul 2013 01:46:51 -0500 Subject: [PATCH] Corrected wrong import for xml_reflection.basics module --- urdf_parser_py/src/urdf_parser_py/sdf.py | 2 +- urdf_parser_py/src/urdf_parser_py/urdf.py | 6 +++--- xml_reflection/src/xml_reflection/core.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/urdf_parser_py/src/urdf_parser_py/sdf.py b/urdf_parser_py/src/urdf_parser_py/sdf.py index 287bbf13..30e1abe2 100644 --- a/urdf_parser_py/src/urdf_parser_py/sdf.py +++ b/urdf_parser_py/src/urdf_parser_py/sdf.py @@ -1,4 +1,4 @@ -from urdf_parser_py.basics import * +from xml_reflection.basics import * import xml_reflection as xmlr # What is the scope of plugins? Model, World, Sensor? diff --git a/urdf_parser_py/src/urdf_parser_py/urdf.py b/urdf_parser_py/src/urdf_parser_py/urdf.py index 9b2fdc7b..ee025df7 100644 --- a/urdf_parser_py/src/urdf_parser_py/urdf.py +++ b/urdf_parser_py/src/urdf_parser_py/urdf.py @@ -1,4 +1,4 @@ -from urdf_parser_py.basics import * +from xml_reflection.basics import * import xml_reflection as xmlr # Add a 'namespace' for names so that things don't conflict between URDF and SDF? @@ -234,7 +234,7 @@ def __init__(self, effort=None, velocity=None, lower=None, upper=None): #FIXME: we are missing __str__ here. class JointMimic(xmlr.Object): - def __init__(self, joint_name, multiplier=None, offset=None): + def __init__(self, joint_name=None, multiplier=None, offset=None): self.joint_name = joint_name self.multiplier = multiplier self.offset = offset @@ -246,7 +246,7 @@ def __init__(self, joint_name, multiplier=None, offset=None): ]) class SafetyController(xmlr.Object): - def __init__(self, velocity, position=None, lower=None, upper=None): + def __init__(self, velocity=None, position=None, lower=None, upper=None): self.k_velocity = velocity self.k_position = position self.soft_lower_limit = lower diff --git a/xml_reflection/src/xml_reflection/core.py b/xml_reflection/src/xml_reflection/core.py index 451f4412..3c8dce4d 100644 --- a/xml_reflection/src/xml_reflection/core.py +++ b/xml_reflection/src/xml_reflection/core.py @@ -1,4 +1,4 @@ -from urdf_parser_py.basics import * +from xml_reflection.basics import * import copy # TODO Make this work with decorators