Skip to content

Fixes bug in xml_string method and updates rosdeps for ROS2 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahcorde merged 1 commit into from
Mar 15, 2019
Merged

Fixes bug in xml_string method and updates rosdeps for ROS2 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<depend>python</depend>
<exec_depend>python-lxml</exec_depend>
<exec_depend>python-yaml</exec_depend>
<test_depend>python-mock</test_depend>
<exec_depend>python3-lxml</exec_depend>
<exec_depend>python3-yaml</exec_depend>
<test_depend>python3-mock</test_depend>

<export>
<build_type>ament_python</build_type>
Expand Down
11 changes: 0 additions & 11 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,3 @@
license='Apache License, Version 2.0',
tests_require=['pytest'],
)

# from distutils.core import setup
# from catkin_pkg.python_setup import generate_distutils_setup
#
# d = generate_distutils_setup(
# packages=['urdf_parser_py', 'urdf_parser_py.xml_reflection'],
# package_dir={'': 'src'}
# )
#
# setup(**d)
#
2 changes: 1 addition & 1 deletion src/urdf_parser_py/xml_reflection/basics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

def xml_string(rootXml, addHeader=True):
# Meh
xmlString = etree.tostring(rootXml, pretty_print=True)
xmlString = etree.tostring(rootXml, pretty_print=True, encoding=str)
if addHeader:
xmlString = '<?xml version="1.0"?>\n' + xmlString
return xmlString
Expand Down