Fix logic in Project.conf_dir #1629
Merged
Conversation
This file contains hidden or 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
The original implementation replaced "/conf.py" with an empty string, where it only wanted to return the directory name of the conf.py file. This resulted in problems when "/conf.py" was part of the directory name! Fixes #1553.
|
@agjohnson @ericholscher up for a review/merge? |
| return conf_py_path.replace('conf.py', '') | ||
| conf_py_path = self.project.conf_dir(self.slug) | ||
| if not conf_py_path.endswith('/'): | ||
| conf_py_path += '/' |
There was a problem hiding this comment.
This should be os.path.sep or rely on os.path.join. Also, if you use os.path.relpath below, you shouldn't need this at all as it handles normalizing paths a little bit
There was a problem hiding this comment.
Excellent idea. Fixed.
agjohnson
added a commit
that referenced
this pull request
Sep 14, 2015
…-in-the-path Fix logic in Project.conf_dir
agjohnson
deleted the
fix-project-conf-dir-if-conf.py-is-in-the-path
branch
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.
The original implementation replaced "/conf.py" with an empty string, where it
only wanted to return the directory name of the conf.py file. This resulted in
problems when "/conf.py" was part of the directory name!
Fixes #1553.