mirror of https://github.com/ansible/ansible.git
Remove deprecated pycompat24 and importlib (#84161)
* Removed deprecated pycompat24 and importlib Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> * Make CI green Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> * Ignore basic.py Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> * Make CI green III Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> * Make CI green IV Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> --------- Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>pull/75854/merge
Abhijeet Kasurde
1 year ago
committed by
GitHub
parent
1b46b5923e
commit
3a40ba3b2c
@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
removed_features:
|
||||||
|
- removed deprecated pycompat24 and compat.importlib.
|
||||||
@ -1,26 +0,0 @@
|
|||||||
# Copyright (c) 2020 Matt Martz <matt@sivel.net>
|
|
||||||
# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from ansible.module_utils.common.warnings import deprecate
|
|
||||||
|
|
||||||
|
|
||||||
def __getattr__(importable_name):
|
|
||||||
"""Inject import-time deprecation warnings.
|
|
||||||
|
|
||||||
Specifically, for ``import_module()``.
|
|
||||||
"""
|
|
||||||
if importable_name == 'import_module':
|
|
||||||
deprecate(
|
|
||||||
msg=f'The `ansible.module_utils.compat.importlib.'
|
|
||||||
f'{importable_name}` function is deprecated.',
|
|
||||||
version='2.19',
|
|
||||||
)
|
|
||||||
from importlib import import_module
|
|
||||||
return import_module
|
|
||||||
|
|
||||||
raise AttributeError(
|
|
||||||
f'cannot import name {importable_name !r} '
|
|
||||||
f'has no attribute ({__file__ !s})',
|
|
||||||
)
|
|
||||||
@ -1,73 +0,0 @@
|
|||||||
# This code is part of Ansible, but is an independent component.
|
|
||||||
# This particular file snippet, and this file snippet only, is BSD licensed.
|
|
||||||
# Modules you write using this snippet, which is embedded dynamically by Ansible
|
|
||||||
# still belong to the author of the module, and may assign their own license
|
|
||||||
# to the complete work.
|
|
||||||
#
|
|
||||||
# Copyright (c) 2016, Toshio Kuratomi <tkuratomi@ansible.com>
|
|
||||||
# Copyright (c) 2015, Marius Gedminas
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without modification,
|
|
||||||
# are permitted provided that the following conditions are met:
|
|
||||||
#
|
|
||||||
# * Redistributions of source code must retain the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer.
|
|
||||||
# * Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
# this list of conditions and the following disclaimer in the documentation
|
|
||||||
# and/or other materials provided with the distribution.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
||||||
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
|
||||||
# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import sys
|
|
||||||
|
|
||||||
from ansible.module_utils.common.warnings import deprecate
|
|
||||||
|
|
||||||
|
|
||||||
def get_exception():
|
|
||||||
"""Get the current exception.
|
|
||||||
|
|
||||||
This code needs to work on Python 2.4 through 3.x, so we cannot use
|
|
||||||
"except Exception, e:" (SyntaxError on Python 3.x) nor
|
|
||||||
"except Exception as e:" (SyntaxError on Python 2.4-2.5).
|
|
||||||
Instead we must use ::
|
|
||||||
|
|
||||||
except Exception:
|
|
||||||
e = get_exception()
|
|
||||||
|
|
||||||
"""
|
|
||||||
deprecate(
|
|
||||||
msg='The `ansible.module_utils.pycompat24.get_exception` '
|
|
||||||
'function is deprecated.',
|
|
||||||
version='2.19',
|
|
||||||
)
|
|
||||||
return sys.exc_info()[1]
|
|
||||||
|
|
||||||
|
|
||||||
def __getattr__(importable_name):
|
|
||||||
"""Inject import-time deprecation warning for ``literal_eval()``."""
|
|
||||||
if importable_name == 'literal_eval':
|
|
||||||
deprecate(
|
|
||||||
msg=f'The `ansible.module_utils.pycompat24.'
|
|
||||||
f'{importable_name}` function is deprecated.',
|
|
||||||
version='2.19',
|
|
||||||
)
|
|
||||||
from ast import literal_eval
|
|
||||||
return literal_eval
|
|
||||||
|
|
||||||
raise AttributeError(
|
|
||||||
f'cannot import name {importable_name !r} '
|
|
||||||
f'has no attribute ({__file__ !s})',
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
__all__ = ('get_exception', 'literal_eval') # pylint: disable=undefined-all-variable
|
|
||||||
Loading…
Reference in New Issue