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

Wrap formatted log statements with six.u() in cloud/__init__.py #30375

Merged
merged 1 commit into from Jan 15, 2016

Conversation

Projects
None yet
3 participants
@rallytime
Contributor

rallytime commented Jan 15, 2016

Fixes #30374

Refs #30374

Fixes the cloud/__initi__.py unicode issues described in #30374 by converting the string to unicode before the format function executes with six.u(), and allows for Python 3 compatibility.

See this comment for more information.

@rallytime

This comment has been minimized.

Show comment
Hide comment
@rallytime

rallytime Jan 15, 2016

Contributor

ping @s0undt3ch

Contributor

rallytime commented Jan 15, 2016

ping @s0undt3ch

@s0undt3ch

This comment has been minimized.

Show comment
Hide comment
@s0undt3ch

s0undt3ch Jan 15, 2016

Member

👍

Member

s0undt3ch commented Jan 15, 2016

👍

cachedout added a commit that referenced this pull request Jan 15, 2016

Merge pull request #30375 from rallytime/fix-cloud-log-formatting
Wrap formatted log statements with six.u() in cloud/__init__.py

@cachedout cachedout merged commit 6ac1f6c into saltstack:2015.8 Jan 15, 2016

2 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11346 — FAILURE
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #8834 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12756 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12452 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:fix-cloud-log-formatting branch Jan 19, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment