mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Simplify the deprecation decorator and deprecated dictionary and only use the version number.
This commit is contained in:
parent
de670b3965
commit
d695107f7c
34 changed files with 40 additions and 204 deletions
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
"""
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
"""
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
"""
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
"""
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
"""
|
||||
|
|
|
@ -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__():
|
||||
|
|
|
@ -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__():
|
||||
|
|
Loading…
Add table
Reference in a new issue