Simplify the deprecation decorator and deprecated dictionary and only use the version number.

This commit is contained in:
Gareth J. Greenaway 2023-06-09 09:32:16 -07:00 committed by David Murphy
parent de670b3965
commit d695107f7c
No known key found for this signature in database
GPG key ID: 2A0B9ABC42BBA5E9
34 changed files with 40 additions and 204 deletions

View file

@ -66,12 +66,7 @@ try:
except ImportError:
HAS_BOTO3 = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -74,12 +74,7 @@ except ImportError:
log = logging.getLogger(__name__)
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -70,12 +70,7 @@ try:
except ImportError:
HAS_BOTO3 = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -60,12 +60,7 @@ except ImportError:
HAS_BOTO = False
# pylint: enable=unused-import
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -106,12 +106,8 @@ except ImportError:
# pylint: enable=import-error
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():
"""

View file

@ -76,12 +76,7 @@ try:
except ImportError:
HAS_BOTO = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -52,12 +52,7 @@ try:
except ImportError:
HAS_BOTO = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -68,12 +68,7 @@ except ImportError:
log = logging.getLogger(__name__)
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -72,12 +72,7 @@ except ImportError:
HAS_BOTO = False
# pylint: enable=import-error
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -65,12 +65,8 @@ except ImportError:
log = logging.getLogger(__name__)
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():
"""

View file

@ -67,12 +67,7 @@ except ImportError as e:
HAS_BOTO = False
# pylint: enable=import-error
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -100,12 +100,7 @@ except ImportError:
HAS_BOTO = False
# pylint: enable=import-error
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -23,12 +23,7 @@ try:
except ImportError:
HAS_BOTO3 = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -80,12 +80,7 @@ except ImportError:
log = logging.getLogger(__name__)
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -71,12 +71,7 @@ except ImportError:
log = logging.getLogger(__name__)
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -63,12 +63,8 @@ except ImportError:
log = logging.getLogger(__name__)
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():
"""

View file

@ -66,12 +66,7 @@ try:
except ImportError:
HAS_BOTO = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -100,12 +100,7 @@ except ImportError:
HAS_BOTO = False
# pylint: enable=import-error
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -68,12 +68,7 @@ except ImportError:
log = logging.getLogger(__name__)
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -59,12 +59,7 @@ except ImportError:
log = logging.getLogger(__name__)
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -62,12 +62,7 @@ except ImportError:
log = logging.getLogger(__name__)
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -76,12 +76,8 @@ except ImportError:
# pylint: enable=import-error
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():
"""

View file

@ -66,12 +66,7 @@ log = logging.getLogger(__name__)
__virtualname__ = "boto_kinesis"
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -56,12 +56,7 @@ try:
except (ImportError, AttributeError):
HAS_BOTO = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -108,12 +108,7 @@ except ImportError:
HAS_BOTO = False
# pylint: enable=import-error
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -127,12 +127,8 @@ def __virtual__():
return salt.utils.versions.check_boto_reqs(boto3_ver="1.3.1")
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __init__(opts):
if HAS_BOTO:

View file

@ -68,12 +68,7 @@ try:
except ImportError:
HAS_BOTO = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -70,12 +70,7 @@ except ImportError:
HAS_BOTO = False
# pylint: enable=import-error
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -76,12 +76,7 @@ except ImportError:
HAS_BOTO = False
# pylint: enable=import-error
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -64,12 +64,7 @@ try:
except ImportError:
HAS_BOTO = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -59,12 +59,7 @@ try:
except ImportError:
HAS_BOTO = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -68,12 +68,8 @@ except ImportError:
HAS_BOTO3 = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():
"""

View file

@ -19,12 +19,7 @@ import salt.utils.versions
log = logging.getLogger(__name__)
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():

View file

@ -168,12 +168,7 @@ try:
except ImportError:
HAS_BOTO3 = False
__deprecated__ = (
3009,
"Potassium",
"boto",
"https://github.com/salt-extensions/saltext-boto"
)
__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto")
def __virtual__():