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

ansible_native_concat: use to_text rather than jinja2's text_type #68038

Merged
merged 2 commits into from
Mar 24, 2020
Merged

ansible_native_concat: use to_text rather than jinja2's text_type #68038

merged 2 commits into from
Mar 24, 2020

Conversation

mkrizek
Copy link
Contributor

@mkrizek mkrizek commented Mar 5, 2020

SUMMARY

jinja2._compat.text_type has been removed in jinja2's master branch so
use ansible's to_text instead.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT

lib/ansible/template/native_helpers.py

@ansibot ansibot added affects_2.10 This issue/PR affects Ansible v2.10 bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. needs_triage Needs a first human triage before being processed. support:core This issue/PR relates to code supported by the Ansible Engineering Team. labels Mar 5, 2020
@mkrizek mkrizek added the native_jinja issues related to jinja native types label Mar 5, 2020
@samdoran samdoran removed the needs_triage Needs a first human triage before being processed. label Mar 5, 2020
samdoran
samdoran approved these changes Mar 5, 2020
View reviewed changes
Copy link
Contributor

@samdoran samdoran left a comment

Choose a reason for hiding this comment

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

Probably needs a changelog fragment.

@ansibot ansibot added the stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. label Mar 13, 2020
@mkrizek
ansible_native_concat: use to_text rather than jinja2's text_type
b4dc56b 
jinja2._compat.text_type has been removed in jinja2's master branch so
use ansible's to_text instead.
@mkrizek
Add changelog
b53d10b
@ansibot ansibot added support:community This issue/PR relates to code supported by the Ansible community. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. and removed stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. core_review In order to be merged, this PR must follow the core review workflow. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Mar 24, 2020
@mkrizek mkrizek merged commit 550e021 into ansible:devel Mar 24, 2020
@mkrizek mkrizek deleted the native-types-to_text branch March 24, 2020 11:03
@ansible ansible locked and limited conversation to collaborators Apr 21, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@sivel sivel sivel approved these changes

@samdoran samdoran samdoran approved these changes

Assignees
No one assigned
Labels
affects_2.10 This issue/PR affects Ansible v2.10 bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. native_jinja issues related to jinja native types support:community This issue/PR relates to code supported by the Ansible community. support:core This issue/PR relates to code supported by the Ansible Engineering Team.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mkrizek @sivel @samdoran @ansibot