fix paths (and regex for paths) comparison issues #1592
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ndows path delimiter for regex comparison
dirk-thomas
reviewed
Jan 30, 2019
| @@ -116,6 +116,8 @@ def test_loggers(self): | |||
| base, ext = os.path.splitext(this_file) | |||
| if ext == '.pyc': | |||
| this_file = base + '.py' | |||
| if os.path.sep == '\\': | |||
| this_file = this_file.replace(os.path.sep, r'\\') | |||
There was a problem hiding this comment.
Wouldn't it make more sense to re.escape(this_file)?
Same below.
There was a problem hiding this comment.
thanks for sharing this with us! will change to use re.escape
dirk-thomas
reviewed
Feb 4, 2019
| @@ -116,6 +116,7 @@ def test_loggers(self): | |||
| base, ext = os.path.splitext(this_file) | |||
| if ext == '.pyc': | |||
| this_file = base + '.py' | |||
| this_file = re.escape(this_file) | |||
There was a problem hiding this comment.
Please apply the escaping where it is being used - in this case directly in line 182.
| @@ -92,6 +93,7 @@ def test_rosconsole__logging_format(): | |||
| base, ext = os.path.splitext(this_file) | |||
| if ext == '.pyc': | |||
| this_file = base + '.py' | |||
| this_file = re.escape(this_file) | |||
There was a problem hiding this comment.
Please apply the escaping where it is being used - in this case directly in line 114.
|
Thank you for the patch and for iterating on it. |
tahsinkose
pushed a commit
to tahsinkose/ros_comm
that referenced
this pull request
Apr 15, 2019
* add os.path.normcase for return value of Logger.FindCaller, escape windows path delimiter for regex comparison * escape os path separator for regular expression comparison * use os.path.sep to indicate path separator * use re.escape to escape metacharacters * apply escaping only when the string is used for comparison
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
\as path separator (Windows, Mac OS), need to escapeos.path.sepfor regular expression comparison