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

fix python26 archive zip module #36719

Merged
merged 1 commit into from
Sep 30, 2016
Merged

Conversation

Ch3LL
Copy link
Contributor

@Ch3LL Ch3LL commented Sep 30, 2016

What does this PR do?

It fixes the error when attempting to run archive.zip on python26 VMs.

What issues does this PR fix or reference?

fixes #36718

Previous Behavior

[root@8de2f6775883 testing]# salt-call --local archive.zip /test.zip /tmp/test/touch1                                                                                       
Error running 'archive.zip': Exception encountered creating zipfile: ZipFile instance has no attribute '__exit__'

New Behavior

[root@8d4e467cb005 testing]# salt-call --local archive.zip /test.zip /tmp/test/touch1 
local:
    - tmp/test/touch1

Tests written?

This actually fixes a test that is currently failling: integration.modules.archive.ArchiveTest.test_zip

@Ch3LL
Copy link
Contributor Author

Ch3LL commented Sep 30, 2016

should also fix test: integration.modules.archive.ArchiveTest.test_unzip

@rallytime
Copy link
Contributor

Nice work!

@rallytime rallytime merged commit 48d2b01 into saltstack:2016.3 Sep 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants