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.

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

#2164 - fix Jinja2 processing of site config #2165

Merged
merged 2 commits into from
Feb 17, 2017
Merged

#2164 - fix Jinja2 processing of site config #2165

merged 2 commits into from
Feb 17, 2017

Conversation

mjwoods
Copy link

@mjwoods mjwoods commented Feb 17, 2017

jinja2support.py uses None to indicate that no Jinja2 template variables are defined. This causes an error when passed to the Jinja2 render method, which expects a dictionary. The suggested solution involves converting None into an empty dictionary.

Close #2164.

@matthewrmshin matthewrmshin added the bug Something is wrong :( label Feb 17, 2017
@matthewrmshin matthewrmshin added this to the next release milestone Feb 17, 2017
Copy link
Contributor

@matthewrmshin matthewrmshin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks OK. (I'll add an automated test as a follow on.)

@hjoliver
Copy link
Member

Thanks @mjwoods - hope we see some more of you in the future!

@hjoliver hjoliver merged commit ec3ad0f into cylc:master Feb 17, 2017
matthewrmshin added a commit to matthewrmshin/cylc-flow that referenced this pull request Feb 21, 2017
@mjwoods mjwoods deleted the fix-site-config-jinja branch March 30, 2017 06:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something is wrong :(
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants