From f08ae486425a2a1c08779e778a39dc5858cf37e7 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 11 Jun 2023 22:12:17 +0100 Subject: [PATCH] Vertical tuples are more readable than horizontal ones Signed-off-by: Pedro Algarvio --- salt/modules/boto3_elasticache.py | 6 +++++- salt/modules/boto3_elasticsearch.py | 6 +++++- salt/modules/boto3_route53.py | 6 +++++- salt/modules/boto3_sns.py | 6 +++++- salt/modules/boto_apigateway.py | 6 +++++- salt/modules/boto_asg.py | 6 +++++- salt/modules/boto_cfn.py | 6 +++++- salt/modules/boto_cloudfront.py | 6 +++++- salt/modules/boto_cloudtrail.py | 6 +++++- salt/modules/boto_cloudwatch.py | 6 +++++- salt/modules/boto_cloudwatch_event.py | 6 +++++- salt/modules/boto_cognitoidentity.py | 6 +++++- salt/modules/boto_datapipeline.py | 6 +++++- salt/modules/boto_dynamodb.py | 6 +++++- salt/modules/boto_ec2.py | 6 +++++- salt/modules/boto_efs.py | 6 +++++- salt/modules/boto_elasticache.py | 6 +++++- salt/modules/boto_elasticsearch_domain.py | 6 +++++- salt/modules/boto_elb.py | 6 +++++- salt/modules/boto_elbv2.py | 6 +++++- salt/modules/boto_iam.py | 6 +++++- salt/modules/boto_iot.py | 6 +++++- salt/modules/boto_kinesis.py | 6 +++++- salt/modules/boto_kms.py | 6 +++++- salt/modules/boto_lambda.py | 6 +++++- salt/modules/boto_rds.py | 6 +++++- salt/modules/boto_route53.py | 6 +++++- salt/modules/boto_s3.py | 6 +++++- salt/modules/boto_s3_bucket.py | 6 +++++- salt/modules/boto_secgroup.py | 6 +++++- salt/modules/boto_sns.py | 6 +++++- salt/modules/boto_sqs.py | 6 +++++- salt/modules/boto_ssm.py | 6 +++++- salt/modules/boto_vpc.py | 6 +++++- 34 files changed, 170 insertions(+), 34 deletions(-) diff --git a/salt/modules/boto3_elasticache.py b/salt/modules/boto3_elasticache.py index 054beed1cd6e..fd55ad51a137 100644 --- a/salt/modules/boto3_elasticache.py +++ b/salt/modules/boto3_elasticache.py @@ -66,7 +66,11 @@ except ImportError: HAS_BOTO3 = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto3_elasticsearch.py b/salt/modules/boto3_elasticsearch.py index 1778cccd2644..fd50e3072d3b 100644 --- a/salt/modules/boto3_elasticsearch.py +++ b/salt/modules/boto3_elasticsearch.py @@ -74,7 +74,11 @@ log = logging.getLogger(__name__) -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto3_route53.py b/salt/modules/boto3_route53.py index 23dd1914ecba..f7afa7d47ba6 100644 --- a/salt/modules/boto3_route53.py +++ b/salt/modules/boto3_route53.py @@ -70,7 +70,11 @@ except ImportError: HAS_BOTO3 = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto3_sns.py b/salt/modules/boto3_sns.py index 380085e9f97a..8c05dc0d7a04 100644 --- a/salt/modules/boto3_sns.py +++ b/salt/modules/boto3_sns.py @@ -60,7 +60,11 @@ HAS_BOTO = False # pylint: enable=unused-import -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_apigateway.py b/salt/modules/boto_apigateway.py index fe061491fd79..e9fea549ac1e 100644 --- a/salt/modules/boto_apigateway.py +++ b/salt/modules/boto_apigateway.py @@ -106,7 +106,11 @@ # pylint: enable=import-error -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_asg.py b/salt/modules/boto_asg.py index 0926727c236b..9e24d1b16c96 100644 --- a/salt/modules/boto_asg.py +++ b/salt/modules/boto_asg.py @@ -76,7 +76,11 @@ except ImportError: HAS_BOTO = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_cfn.py b/salt/modules/boto_cfn.py index 5fe428b13868..366771c69ba1 100644 --- a/salt/modules/boto_cfn.py +++ b/salt/modules/boto_cfn.py @@ -52,7 +52,11 @@ except ImportError: HAS_BOTO = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_cloudfront.py b/salt/modules/boto_cloudfront.py index a1b36b34ab7e..5cfb3987d93b 100644 --- a/salt/modules/boto_cloudfront.py +++ b/salt/modules/boto_cloudfront.py @@ -68,7 +68,11 @@ log = logging.getLogger(__name__) -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_cloudtrail.py b/salt/modules/boto_cloudtrail.py index 1332c59c58ef..53bbdce42fda 100644 --- a/salt/modules/boto_cloudtrail.py +++ b/salt/modules/boto_cloudtrail.py @@ -72,7 +72,11 @@ HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_cloudwatch.py b/salt/modules/boto_cloudwatch.py index 9676d18d2bbe..63711f7c325c 100644 --- a/salt/modules/boto_cloudwatch.py +++ b/salt/modules/boto_cloudwatch.py @@ -65,7 +65,11 @@ log = logging.getLogger(__name__) -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_cloudwatch_event.py b/salt/modules/boto_cloudwatch_event.py index bf566ba4b325..67c52c428932 100644 --- a/salt/modules/boto_cloudwatch_event.py +++ b/salt/modules/boto_cloudwatch_event.py @@ -67,7 +67,11 @@ HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_cognitoidentity.py b/salt/modules/boto_cognitoidentity.py index f79a6b0595ea..cd407b9b6194 100644 --- a/salt/modules/boto_cognitoidentity.py +++ b/salt/modules/boto_cognitoidentity.py @@ -100,7 +100,11 @@ HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_datapipeline.py b/salt/modules/boto_datapipeline.py index 42a3fa63a1e5..9f32c4ae19b4 100644 --- a/salt/modules/boto_datapipeline.py +++ b/salt/modules/boto_datapipeline.py @@ -23,7 +23,11 @@ except ImportError: HAS_BOTO3 = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_dynamodb.py b/salt/modules/boto_dynamodb.py index d62d27b2fa90..0d8427839a73 100644 --- a/salt/modules/boto_dynamodb.py +++ b/salt/modules/boto_dynamodb.py @@ -80,7 +80,11 @@ log = logging.getLogger(__name__) -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_ec2.py b/salt/modules/boto_ec2.py index 5b1f4c5011d5..7d36cbc19b61 100644 --- a/salt/modules/boto_ec2.py +++ b/salt/modules/boto_ec2.py @@ -71,7 +71,11 @@ log = logging.getLogger(__name__) -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_efs.py b/salt/modules/boto_efs.py index ec99ab8624da..20ba60482137 100644 --- a/salt/modules/boto_efs.py +++ b/salt/modules/boto_efs.py @@ -63,7 +63,11 @@ log = logging.getLogger(__name__) -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_elasticache.py b/salt/modules/boto_elasticache.py index ce7b8bbe6e00..8a38be1b4107 100644 --- a/salt/modules/boto_elasticache.py +++ b/salt/modules/boto_elasticache.py @@ -66,7 +66,11 @@ except ImportError: HAS_BOTO = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_elasticsearch_domain.py b/salt/modules/boto_elasticsearch_domain.py index 89be33075ee2..1e66e4f2110a 100644 --- a/salt/modules/boto_elasticsearch_domain.py +++ b/salt/modules/boto_elasticsearch_domain.py @@ -100,7 +100,11 @@ HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_elb.py b/salt/modules/boto_elb.py index 748cbc2be8e5..643ea4da372a 100644 --- a/salt/modules/boto_elb.py +++ b/salt/modules/boto_elb.py @@ -68,7 +68,11 @@ log = logging.getLogger(__name__) -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_elbv2.py b/salt/modules/boto_elbv2.py index 90a888b22335..ed5ab80764ed 100644 --- a/salt/modules/boto_elbv2.py +++ b/salt/modules/boto_elbv2.py @@ -59,7 +59,11 @@ log = logging.getLogger(__name__) -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_iam.py b/salt/modules/boto_iam.py index 1b805b8804ea..e16bbf36e424 100644 --- a/salt/modules/boto_iam.py +++ b/salt/modules/boto_iam.py @@ -62,7 +62,11 @@ log = logging.getLogger(__name__) -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_iot.py b/salt/modules/boto_iot.py index 69f26390ca60..d3995ca06ffb 100644 --- a/salt/modules/boto_iot.py +++ b/salt/modules/boto_iot.py @@ -76,7 +76,11 @@ # pylint: enable=import-error -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_kinesis.py b/salt/modules/boto_kinesis.py index 1afebe915daa..c179529c9c57 100644 --- a/salt/modules/boto_kinesis.py +++ b/salt/modules/boto_kinesis.py @@ -66,7 +66,11 @@ __virtualname__ = "boto_kinesis" -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_kms.py b/salt/modules/boto_kms.py index 6d3eaffc7770..37a654a5cd11 100644 --- a/salt/modules/boto_kms.py +++ b/salt/modules/boto_kms.py @@ -56,7 +56,11 @@ except (ImportError, AttributeError): HAS_BOTO = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_lambda.py b/salt/modules/boto_lambda.py index e63659799786..c8a7d2f4bccf 100644 --- a/salt/modules/boto_lambda.py +++ b/salt/modules/boto_lambda.py @@ -108,7 +108,11 @@ HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_rds.py b/salt/modules/boto_rds.py index 815a7c949117..01b7317497d8 100644 --- a/salt/modules/boto_rds.py +++ b/salt/modules/boto_rds.py @@ -127,7 +127,11 @@ def __virtual__(): return salt.utils.versions.check_boto_reqs(boto3_ver="1.3.1") -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __init__(opts): diff --git a/salt/modules/boto_route53.py b/salt/modules/boto_route53.py index 9cc62b344198..4e5c4a762dda 100644 --- a/salt/modules/boto_route53.py +++ b/salt/modules/boto_route53.py @@ -68,7 +68,11 @@ except ImportError: HAS_BOTO = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_s3.py b/salt/modules/boto_s3.py index 016b9908180c..adaef657d29b 100644 --- a/salt/modules/boto_s3.py +++ b/salt/modules/boto_s3.py @@ -70,7 +70,11 @@ HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_s3_bucket.py b/salt/modules/boto_s3_bucket.py index 6e653728d1c4..a30bd99d669d 100644 --- a/salt/modules/boto_s3_bucket.py +++ b/salt/modules/boto_s3_bucket.py @@ -76,7 +76,11 @@ HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_secgroup.py b/salt/modules/boto_secgroup.py index 95068692ebc9..aa55fd1bb6be 100644 --- a/salt/modules/boto_secgroup.py +++ b/salt/modules/boto_secgroup.py @@ -64,7 +64,11 @@ except ImportError: HAS_BOTO = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_sns.py b/salt/modules/boto_sns.py index 05ac52ddb315..f283c62ebee0 100644 --- a/salt/modules/boto_sns.py +++ b/salt/modules/boto_sns.py @@ -59,7 +59,11 @@ except ImportError: HAS_BOTO = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_sqs.py b/salt/modules/boto_sqs.py index bcbd9444b3ca..98ccfb9c3ca9 100644 --- a/salt/modules/boto_sqs.py +++ b/salt/modules/boto_sqs.py @@ -68,7 +68,11 @@ HAS_BOTO3 = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_ssm.py b/salt/modules/boto_ssm.py index 8722ef263cc1..9a896b354e78 100644 --- a/salt/modules/boto_ssm.py +++ b/salt/modules/boto_ssm.py @@ -19,7 +19,11 @@ log = logging.getLogger(__name__) -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__(): diff --git a/salt/modules/boto_vpc.py b/salt/modules/boto_vpc.py index b869538a443a..381326d45d59 100644 --- a/salt/modules/boto_vpc.py +++ b/salt/modules/boto_vpc.py @@ -168,7 +168,11 @@ except ImportError: HAS_BOTO3 = False -__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) def __virtual__():