From 9185e0b7a83c894aeeb1e4a3c6e1d6255ed29614 Mon Sep 17 00:00:00 2001 From: Li Jiapeng Date: Mon, 19 Sep 2016 18:26:16 +0800 Subject: [PATCH 1/2] Avoid circumvention of metadata name checking See https://github.com/getpelican/pelican/issues/2011 --- pelican/readers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pelican/readers.py b/pelican/readers.py index 48985ed6..ed710b26 100644 --- a/pelican/readers.py +++ b/pelican/readers.py @@ -666,8 +666,8 @@ def parse_path_metadata(source_path, settings=None, process=None): if match: # .items() for py3k compat. for k, v in match.groupdict().items(): + k = k.lower() # metadata must be lowercase if k not in metadata: - k = k.lower() # metadata must be lowercase if process: v = process(k, v) metadata[k] = v From 0f6b98506efec3bb957dc4c55f1b6193fa179d77 Mon Sep 17 00:00:00 2001 From: Li Jiapeng Date: Mon, 19 Sep 2016 18:29:58 +0800 Subject: [PATCH 2/2] Revert to the old category processing order If no category is specified in PATH_METADATA or FILENAME_METADATA, fall back to USE_FOLDER_AS_CATEGORY, which defaults to True. --- pelican/readers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pelican/readers.py b/pelican/readers.py index ed710b26..9c0f715e 100644 --- a/pelican/readers.py +++ b/pelican/readers.py @@ -659,7 +659,7 @@ def parse_path_metadata(source_path, settings=None, process=None): ('PATH_METADATA', source_path)]: checks.append((settings.get(key, None), data)) if settings.get('USE_FOLDER_AS_CATEGORY', None): - checks.insert(0, ('(?P.*)', subdir)) + checks.append(('(?P.*)', subdir)) for regexp, data in checks: if regexp and data: match = re.match(regexp, data)