Skip to content
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.

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

Jump to bottom

Support YAML metadata (Issue #2801) #2802

Merged
merged 6 commits into from May 28, 2017
Merged

Support YAML metadata (Issue #2801) #2802

merged 6 commits into from May 28, 2017

Conversation

ralsina
Copy link
Member

@ralsina ralsina commented May 28, 2017

First step in #2801 : Naïve support for YAML metadata.

  • Optional yaml import
  • Fail only if required by posts
  • Parse just like our traditional metadata

Kwpolska
Kwpolska reviewed May 28, 2017
View reviewed changes
nikola/post.py Outdated
utils.req_missing('pyyaml', 'use YAML metadata', optional=True)
raise ValueError('Error parsing metadata')
idx = meta_data.index('---', 1)
meta = yaml.load('\n'.join(meta_data[1:idx]))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Always use yaml.safe_load.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

Kwpolska
Kwpolska approved these changes May 28, 2017
View reviewed changes
Copy link
Member

@Kwpolska Kwpolska left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@felixfontein
Copy link
Contributor

Shouldn't you also adjust the split_metadata function in PageCompiler? The new YAML (and TOML?) metadata allows empty lines between starting and ending --- (resp. +++?).

@ralsina
Copy link
Member Author

ralsina commented May 28, 2017

@felixfontein that's why this is a naive implementation, I don't want to spend two days thinking of corner cases :-)

@ralsina ralsina merged commit 18a4c67 into master May 28, 2017
@ralsina ralsina deleted the yaml-metadata branch May 28, 2017 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kwpolska Kwpolska Kwpolska approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ralsina @felixfontein @Kwpolska