Various SMTP returner fixes #31688
Merged
Various SMTP returner fixes #31688
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
YAML doesn't make sense here since we're just rendering a text email. The user can still override in the smtp renderer settings if the user has complex needs.
compile_template returns StringIO objects.
This is a frequent stumbling block for users unaccustomed to the older `mod.setting` configuration syntax. Often they will interpret the list of settings as needing to be underneat a top-level `smtp` dictionary. This has been on my todo list for a looong time. :-P
|
I would appreciate a little assistance on this, if someone has time. I didn't dive back to see if they were broken recently or broken on arrival. There are tests for this module but I didn't look at them to see what they missed. |
|
Re: the test failure in Jenkins. |
|
@jfindlay Can you take a look here when you get a moment? |
This seems to be specific to Jinja so only do it if needed.
|
I found the subject setting was also messed up. Based on @rallytime's feedback I added a commit to explicitly check for the StringIO object that Jinja returns. This should be more error-tolerant. |
|
Go Go Jenkins! |
2 similar comments
|
Go Go Jenkins! |
|
Go Go Jenkins! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
SMTP returner breakage.
What issues does this PR fix or reference?
The
renderer&templateadditions to the SMTP returner are not working with default settings. The resulting email was blank and the Subject line was<StringIO object>. Switching to only the 'jinja' renderer produces<StringIO object>for both the body and the subject.Previous Behavior
Not working with default settings.
New Behavior
Backward-compatible fixes assuming the
renderer&templateadditions were indeed broken as previously asserted.Tests written?