Skip to content
Permalink
Browse files

JSON metadata is not worth the trouble

  • Loading branch information
ralsina committed May 29, 2017
1 parent 74abaf8 commit 2623322c6315b0fa30e9dd1b78e64ddf2e3bb14a
Showing with 1 addition and 23 deletions.
  1. +1 −1 CHANGES.txt
  2. +0 −12 docs/manual.txt
  3. +0 −10 nikola/post.py
@@ -4,7 +4,7 @@ New in master
Features
--------

* Support for JSON, YAML and TOML metadata (Issue #2801)
* Support for YAML and TOML metadata (Issue #2801)

Bugfixes
--------
@@ -312,18 +312,6 @@ TOML metadata should be wrapped by a "+++" separator and in that case, the usual
date = "2012-09-15 19:52:05 UTC"
+++

JSON metadata is wrapped in braces and the usual JSON syntax applies. Be careful not to leave any
braces alone in a line other than the last one:

.. code:: json

{
title: "How to make money"
slug: "how-to-make-money"
date: "2012-09-15 19:52:05 UTC"
}


Basic
`````

@@ -1053,16 +1053,6 @@ def _get_metadata_from_file(meta_data):
meta = toml.load('\n'.join(meta_data[1:idx]))
return meta

# If 1st line is '{', then it's JSON metadata
if meta_data[0] == '{':
idx = meta_data.index('}', 1)
meta = json.loads('\n'.join(meta_data[1:idx]))
# We expect empty metadata to be '', not None
for k in meta:
if meta[k] is None:
meta[k] = ''
return meta

# First, get metadata from the beginning of the file,
# up to first empty line

0 comments on commit 2623322

Please sign in to comment.