Support blank lines in YAML/TOML metadata (part of issue #2801) #2827
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
felixfontein
reviewed
Jun 6, 2017
nikola/plugin_categories.py
Outdated
| @@ -338,7 +338,12 @@ def split_metadata(self, data): | |||
| This splits in the first empty line that is NOT at the beginning | |||
| of the document. | |||
| """ | |||
| split_result = re.split('(\n\n|\r\n\r\n)', data.lstrip(), maxsplit=1) | |||
| if data.startswith('---'): # YAML metadata | |||
| split_result = re.split('(---\n\n|----\r\n\r\n)', data.lstrip(), maxsplit=1) | |||
There was a problem hiding this comment.
You have four dashes before the Windows newlines. I guess that's one too many.
There was a problem hiding this comment.
Also: isn't it better to split along \n\n---\n\n (for Unix-style newlines) instead of ---\n\n? Otherwise, a line ending with --- will also suffice for a split (which is probably not what you want), as opposed to a line containing only ---.
There was a problem hiding this comment.
Good points. I think you mean "\n---\n\n" but yes :-)
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.
Split on the right markers for YAML/TOML metadata.