Skip to content

Commit

Permalink
Avoid name clash with builtin filter function.
Browse files Browse the repository at this point in the history
  • Loading branch information
felixfontein committed Jun 4, 2017
1 parent 2c602a3 commit 807ed73
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions nikola/nikola.py
Expand Up @@ -1193,9 +1193,9 @@ def init_plugins(self, commands_only=False, load_all=False):
for i, f in list(enumerate(actions)):
if isinstance(f, str):
# Check whether this denotes a registered filter
filter = self.filters.get(f)
if filter is not None:
f = filter
_f = self.filters.get(f)
if _f is not None:
f = _f
actions[i] = f
if hasattr(f, 'configuration_variables'):
args = {}
Expand Down
6 changes: 3 additions & 3 deletions nikola/plugins/task/posts.py
Expand Up @@ -108,9 +108,9 @@ def tl_ch():
for i, f in enumerate(ff):
if not f:
continue
filter = self.site.filters.get(f)
if filter is not None: # A registered filter
flist.append(filter)
_f = self.site.filters.get(f)
if _f is not None: # A registered filter
flist.append(_f)
else:
flist.append(f)
yield utils.apply_filters(task, {os.path.splitext(dest)[-1]: flist})
Expand Down

0 comments on commit 807ed73

Please sign in to comment.