mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-04 17:53:10 +00:00
Remove all usage of ansible.module_utils.six from main branch (#10888)
* Get rid of all six.moves imports. * Get rid of iteritems. * Get rid of *_type(s) aliases. * Replace StringIO import. * Get rid of PY2/PY3 constants. * Get rid of raise_from. * Get rid of python_2_unicode_compatible. * Clean up global six imports. * Remove all usage of ansible.module_utils.six. * Linting. * Fix xml module. * Docs adjustments.
This commit is contained in:
@@ -4,8 +4,6 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from ansible.module_utils.six import raise_from
|
||||
|
||||
from ansible_collections.community.general.plugins.module_utils import deps
|
||||
|
||||
|
||||
@@ -49,7 +47,7 @@ class PackageRequirement:
|
||||
return req.name, req
|
||||
|
||||
except Exception as e:
|
||||
raise_from(ValueError("Invalid package specification for '{0}': {1}".format(name, e)), e)
|
||||
raise ValueError("Invalid package specification for '{0}': {1}".format(name, e)) from e
|
||||
|
||||
def matches_version(self, version):
|
||||
"""
|
||||
@@ -70,4 +68,4 @@ class PackageRequirement:
|
||||
return ver in self.requirement.specifier
|
||||
|
||||
except InvalidVersion as e:
|
||||
raise_from(ValueError("Invalid version '{0}': {1}".format(version, e)))
|
||||
raise ValueError("Invalid version '{0}': {1}".format(version, e)) from e
|
||||
|
||||
Reference in New Issue
Block a user