Skip to content

Commit

Permalink
Corrected wrong import for xml_reflection.basics module
Browse files Browse the repository at this point in the history
  • Loading branch information
eacousineau committed Jul 11, 2013
1 parent 763e0fc commit 7518c17
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion urdf_parser_py/src/urdf_parser_py/sdf.py
Original file line number Diff line number Diff line change
@@ -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?
Expand Down
6 changes: 3 additions & 3 deletions urdf_parser_py/src/urdf_parser_py/urdf.py
Original file line number Diff line number Diff line change
@@ -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?
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion xml_reflection/src/xml_reflection/core.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from urdf_parser_py.basics import *
from xml_reflection.basics import *
import copy

# TODO Make this work with decorators
Expand Down

0 comments on commit 7518c17

Please sign in to comment.