ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Replace deprecated error with BadZipFile (#6180)

Browse source 
* Replace deprecated error with BadZipFile

* Use imported BadZipFile

Co-authored-by: Felix Fontein <felix@fontein.de>

* Add news fragment

* Update new fragment

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
Hugo van Kemenade 2023-03-22 08:39:18 +02:00 committed by GitHub
parent 3fb1ff0b72
commit f66cc7c933
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/6180-replace-deprecated-badzipfile.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "archive - avoid deprecated exception class on Python 3 (https://github.com/ansible-collections/community.general/pull/6180)."

6
plugins/modules/archive.py
View file

@ -198,6 +198,10 @@ from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils.common.text.converters import to_bytes, to_native from ansible.module_utils.common.text.converters import to_bytes, to_native
from ansible.module_utils import six from ansible.module_utils import six
try: # python 3.2+
from zipfile import BadZipFile # type: ignore[attr-defined]
except ImportError: # older python
from zipfile import BadZipfile as BadZipFile
LZMA_IMP_ERR = None LZMA_IMP_ERR = None
if six.PY3: if six.PY3:
@ -534,7 +538,7 @@ class ZipArchive(Archive):
archive = zipfile.ZipFile(_to_native_ascii(path), 'r') archive = zipfile.ZipFile(_to_native_ascii(path), 'r')
checksums = set((info.filename, info.CRC) for info in archive.infolist()) checksums = set((info.filename, info.CRC) for info in archive.infolist())
archive.close() archive.close()
except zipfile.BadZipfile: except BadZipFile:
checksums = set() checksums = set()
return checksums return checksums