Skip to content

Add the ability to import filters #1

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Mar 4, 2024
Merged

Add the ability to import filters #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
816d698
Add the ability to import filters
mattrobenolt Apr 24, 2020
c1a95cd
ci: Swap python 3.4 with 3.8
mattrobenolt Apr 24, 2020
a93f720
bump version
rddimon Mar 4, 2024
a40d7b3
Remove travis changes
rddimon Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jinja2cli/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"""

__author__ = "Matt Robenolt"
__version__ = "0.8.2"
__version__ = "0.8.3"

from .cli import main # NOQA
19 changes: 17 additions & 2 deletions jinja2cli/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def _load_json5():
}


def render(template_path, data, extensions, strict=False):
def render(template_path, data, extensions, filters, strict=False):
from jinja2 import (
__version__ as jinja_version,
Environment,
Expand Down Expand Up @@ -273,6 +273,13 @@ def render(template_path, data, extensions, strict=False):
env.globals["environ"] = lambda key: force_text(os.environ.get(key))
env.globals["get_context"] = lambda: data

if filters:
from jinja2.utils import import_string

for filter in set(filters):
filter = import_string(filter)
env.filters[filter.__name__] = filter

return env.get_template(os.path.basename(template_path)).render(data)


Expand Down Expand Up @@ -362,7 +369,7 @@ def cli(opts, args):

out = codecs.getwriter("utf8")(out)

out.write(render(template_path, data, extensions, opts.strict))
out.write(render(template_path, data, extensions, opts.filters, opts.strict))
out.flush()
return 0

Expand Down Expand Up @@ -430,6 +437,14 @@ def main():
action="append",
default=["do", "loopcontrols"],
)
parser.add_option(
"-f",
"--filter",
help="extra jinja2 filters to load",
dest="filters",
action="append",
default=[],
)
parser.add_option(
"-D",
help="Define template variable in the form of key=value",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

setup(
name="jinja2-cli",
version="0.8.2",
version="0.8.3",
author="Matt Robenolt",
author_email="matt@ydekproductions.com",
url="https://github.com/mattrobenolt/jinja2-cli",
Expand Down
4 changes: 2 additions & 2 deletions tests/test_jinja2cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def test_relative_path():
path = "./files/template.j2"

title = b"\xc3\xb8".decode("utf8")
output = cli.render(path, {"title": title}, [])
output = cli.render(path, {"title": title}, [], [])
assert output == title
assert type(output) == cli.text_type

Expand All @@ -20,6 +20,6 @@ def test_absolute_path():
path = os.path.join(absolute_base_path, "files", "template.j2")

title = b"\xc3\xb8".decode("utf8")
output = cli.render(path, {"title": title}, [])
output = cli.render(path, {"title": title}, [], [])
assert output == title
assert type(output) == cli.text_type