Skip to content
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

Jump to bottom

Added support for overriding start and end strings #78

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added support for overriding start and end strings #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 50 additions & 2 deletions jinja2cli/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def _parse_env(data):
}


def render(template_path, data, extensions, strict=False):
def render(template_path, data, extensions, strict=False, opts={}):
from jinja2 import Environment, FileSystemLoader, StrictUndefined

env = Environment(
Expand All @@ -222,6 +222,18 @@ def render(template_path, data, extensions, strict=False):
)
if strict:
env.undefined = StrictUndefined
if opts.block_start_string:
env.block_start_string = opts.block_start_string
if opts.block_end_string:
env.block_end_string = opts.block_end_string
if opts.variable_start_string:
env.variable_start_string = opts.variable_start_string
if opts.variable_end_string:
env.variable_end_string = opts.variable_end_string
if opts.comment_start_string:
env.comment_start_string = opts.comment_start_string
if opts.comment_end_string:
env.comment_end_string = opts.comment_end_string

# Add environ global
env.globals["environ"] = lambda key: force_text(os.environ.get(key))
Expand Down Expand Up @@ -312,7 +324,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.strict, opts))
out.flush()
return 0

Expand Down Expand Up @@ -406,6 +418,42 @@ def main():
metavar="FILE",
action="store",
)
parser.add_option(
"--block_start_string",
help="The string marking the beginning of a block. Defaults to '{%'.",
dest="block_start_string",
action="store",
)
parser.add_option(
"--block_end_string",
help="The string marking the end of a block. Defaults to '%}'.",
dest="block_end_string",
action="store",
)
parser.add_option(
"--variable_start_string",
help="The string marking the beginning of a print statement. Defaults to '{{'.",
dest="variable_start_string",
action="store",
)
parser.add_option(
"--variable_end_string",
help="The string marking the end of a print statement. Defaults to '}}'.",
dest="variable_end_string",
action="store",
)
parser.add_option(
"--comment_start_string",
help="The string marking the beginning of a comment. Defaults to '{#'.",
dest="comment_start_string",
action="store",
)
parser.add_option(
"--comment_end_string",
help="The string marking the end of a comment. Defaults to '#}'.",
dest="comment_end_string",
action="store",
)
opts, args = parser.parse_args()

# Dedupe list
Expand Down