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

Fix unicode directory listing on py2 #48836

Merged
merged 2 commits into from Jul 31, 2018

Conversation

Projects
None yet
4 participants
@dwoz
Contributor

dwoz commented Jul 31, 2018

What does this PR do?

Fix unicode directory listing on py2 after upstream fixes.

WinRb/winrm-fs#67

The combination of the above and this change allow our window fileserver roots tests to pass on both python 2 and python 3. This change is needed to work around python 2's encoding limitations on windows.

I think this might be related too and/or fix:

#41018

Tests written?

No - Fixing existing tests

Commits signed with GPG?

Yes

@dwoz dwoz requested review from terminalmage and gtmanfred Jul 31, 2018

@dwoz dwoz force-pushed the dwoz:unicode_names_py2 branch from bf66b66 to 47e158b Jul 31, 2018

@rallytime rallytime merged commit 950c101 into saltstack:2018.3 Jul 31, 2018

6 of 8 checks passed

jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@dwoz dwoz deleted the dwoz:unicode_names_py2 branch Aug 21, 2018

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