weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

Fix extension-matching bug in generators.py

Browse source 
Addresses #1946.
This commit is contained in:
Kevin Yap 2016-10-12 23:22:33 -07:00
commit 6cadbdf354
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pelican/generators.py
View file

@ -100,8 +100,8 @@ class Generator(object):
"""Inclusion logic for .get_files(), returns True/False """Inclusion logic for .get_files(), returns True/False
:param path: the path which might be including :param path: the path which might be including
:param extensions: the list of allowed extensions (if False, all :param extensions: the list of allowed extensions, or False if all
extensions are allowed) extensions are allowed
""" """
if extensions is None: if extensions is None:
extensions = tuple(self.readers.extensions) extensions = tuple(self.readers.extensions)
@ -112,8 +112,10 @@ class Generator(object):
if any(fnmatch.fnmatch(basename, ignore) for ignore in ignores): if any(fnmatch.fnmatch(basename, ignore) for ignore in ignores):
return False return False
if extensions is False or basename.endswith(extensions): ext = os.path.splitext(basename)[1][1:]
if extensions is False or ext in extensions:
return True return True
return False return False
def get_files(self, paths, exclude=[], extensions=None): def get_files(self, paths, exclude=[], extensions=None):

3
pelican/tests/content/bad_extension.mmd Normal file
View file

@ -0,0 +1,3 @@
Title: Bad Extension
This file shouldn't be included because its file extension is `.mmd`.