Skip to content

Fix path regex substitution #375

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

Closed
Noel215 wants to merge 1 commit into from
+11 −1
Closed

Fix path regex substitution #375

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
10 changes: 10 additions & 0 deletions test/test_xacro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import itertools
import math
import os.path
import pathlib
import re
import shutil
import subprocess
Expand Down Expand Up @@ -1702,6 +1703,15 @@ def test_remove_property(self):
${p}</a>'''
self.assert_matches(self.quick_xacro(src), '<a>2nd</a>')

def test_process_file_types(self):
# Test that checks process_file method with different path types
# os.path
path = os.path.join(os.path.dirname(__file__), 'emoji.xacro')
self.assert_matches(xacro.process(path), '<robot>🍔</robot>')

# pathlib.Path
path = pathlib.Path(os.path.join(os.path.dirname(__file__), 'emoji.xacro'))
self.assert_matches(xacro.process(path), '<robot>🍔</robot>')

if __name__ == '__main__':
unittest.main()
2 changes: 1 addition & 1 deletion xacro/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ def process_file(input_file_name, **kwargs):
banner = [xml.dom.minidom.Comment(c) for c in
[" %s " % ('=' * 83),
# replace consecutive dashes with a single one to yield a XML-compliant comment string
" | This document was autogenerated by xacro from %-30s | " % re.sub(r'-+', '-', input_file_name),
" | This document was autogenerated by xacro from %-30s | " % re.sub(r'-+', '-', str(input_file_name)),
" | EDITING THIS FILE BY HAND IS NOT RECOMMENDED %-30s | " % "",
" %s " % ('=' * 83)]]
first = doc.firstChild
Expand Down
Loading