chore(test) - Add in isort and update all files (aws-cloudformation#2507)

* Run isort on all the files
* Format with black and double quotes

Author: kddejong

.git-blame-ignore-revs

@@ -0,0 +1,4 @@
+# Add in isort and ran on src/ and test/
+2952e5605d88959d6159f5e66df26f33f31748bf
+# Run black with double quotes on all files
+d2f61228a7eab70a25360fd75a13197f7752bb1f

pyproject.toml

@@ -1,6 +1,6 @@
 
 [tool.black]
-skip-string-normalization = true
+skip-string-normalization = false
 
 [tool.bandit]
 skips = ["B101", "B303", "B310", "B110", "B112", "B324", "B404", "B603", "B607"]

src/cfnlint/__init__.py

@@ -3,84 +3,82 @@
 SPDX-License-Identifier: MIT-0
 """
 import logging
-import cfnlint.helpers
+
 import cfnlint.conditions
+import cfnlint.helpers
+import cfnlint.rules
+from cfnlint.decode.node import TemplateAttributeError, dict_node
 from cfnlint.decorators.refactored import refactored
 from cfnlint.graph import Graph
-from cfnlint.transform import Transform
-from cfnlint.decode.node import TemplateAttributeError
 from cfnlint.helpers import PSEUDOPARAMS
-from cfnlint.rules import RuleMatch as _RuleMatch
-from cfnlint.rules import Match as _Match
-from cfnlint.rules import RulesCollection as _RulesCollection
 from cfnlint.rules import CloudFormationLintRule as _CloudFormationLintRule
+from cfnlint.rules import Match as _Match
 from cfnlint.rules import ParseError as _ParseError
-from cfnlint.rules import TransformError as _TransformError
 from cfnlint.rules import RuleError as _RuleError
+from cfnlint.rules import RuleMatch as _RuleMatch
+from cfnlint.rules import RulesCollection as _RulesCollection
+from cfnlint.rules import TransformError as _TransformError
 from cfnlint.runner import Runner as _Runner
 from cfnlint.template import Template as _Template
-
-
-from cfnlint.decode.node import dict_node
-import cfnlint.rules
+from cfnlint.transform import Transform
 
 LOGGER = logging.getLogger(__name__)
 
 
 @refactored(
-    'RuleMatch is refactored and deprecated. Please use cfnlint.rules.RuleMatch'
+    "RuleMatch is refactored and deprecated. Please use cfnlint.rules.RuleMatch"
 )
 class RuleMatch(_RuleMatch):
     """Refactored class RuleMatch"""
 
 
-@refactored('Match is refactored and deprecated. Please use cfnlint.rules.Match')
+@refactored("Match is refactored and deprecated. Please use cfnlint.rules.Match")
 class Match(_Match):
     """Refactored class Match"""
 
 
 @refactored(
-    'RulesCollection is refactored and deprecated. Please use cfnlint.rules.RulesCollection'
+    "RulesCollection is refactored and deprecated. Please use cfnlint.rules.RulesCollection"
 )
 class RulesCollection(_RulesCollection):
     """Refactored class Rules Collection"""
 
 
 @refactored(
-    'CloudFormationLintRule is refactored and deprecated. Please use cfnlint.rules.CloudFormationLintRule'
+    "CloudFormationLintRule is refactored and deprecated. Please use cfnlint.rules.CloudFormationLintRule"
 )
 class CloudFormationLintRule(_CloudFormationLintRule):
     """Refactored class Rules CloudFormationLintRule"""
 
 
 @refactored(
-    'ParseError is refactored and deprecated. Please use cfnlint.rules.ParseError'
+    "ParseError is refactored and deprecated. Please use cfnlint.rules.ParseError"
 )
 class ParseError(_ParseError):
     """Refactored class Rules ParseError"""
 
 
 @refactored(
-    'TransformError is refactored and deprecated. Please use cfnlint.rules.TransformError'
+    "TransformError is refactored and deprecated. Please use cfnlint.rules.TransformError"
 )
 class TransformError(_TransformError):
     """Refactored class Rules TransformError"""
 
 
 @refactored(
-    'RuleError is refactored and deprecated. Please use cfnlint.rules.RuleError'
+    "RuleError is refactored and deprecated. Please use cfnlint.rules.RuleError"
 )
 class RuleError(_RuleError):
     """Refactored class Rules RuleError"""
 
 
 @refactored(
-    'Template is refactored and deprecated. Please use Template in cfnlint.template'
+    "Template is refactored and deprecated. Please use Template in cfnlint.template"
 )
 class Template(_Template):
     """Refactored class Template"""
 
 
-@refactored('Runner is refactored and deprecated. Please use Runner in cfnlint.runner')
+@refactored("Runner is refactored and deprecated. Please use Runner in cfnlint.runner")
 class Runner(_Runner):
     """Refactored class Runner"""

src/cfnlint/__main__.py

@@ -2,34 +2,34 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-import warnings
-import sys
 import logging
-import cfnlint.core
+import sys
+import warnings
 
+import cfnlint.core
 
-LOGGER = logging.getLogger('cfnlint')
+LOGGER = logging.getLogger("cfnlint")
 
 
 def main():
     if sys.version_info[:2] == (3, 4):
         warnings.warn(
-            'Python 3.4 has reached end of life. '
-            'cfn-lint has ended support for python 3.4 as of July 1st, 2020.',
+            "Python 3.4 has reached end of life. "
+            "cfn-lint has ended support for python 3.4 as of July 1st, 2020.",
             Warning,
             stacklevel=3,
         )
     elif sys.version_info[:2] == (3, 5):
         warnings.warn(
-            'Python 3.5 has reached end of life. '
-            'cfn-lint has ended support for python 3.5 as of August 1st, 2021.',
+            "Python 3.5 has reached end of life. "
+            "cfn-lint has ended support for python 3.5 as of August 1st, 2021.",
             Warning,
             stacklevel=3,
         )
     elif sys.version_info[:2] == (2, 7):
         warnings.warn(
-            'Python 2.7 has reached end of life. '
-            'cfn-lint will end support for python 2.7 on June 1st, 2020.',
+            "Python 2.7 has reached end of life. "
+            "cfn-lint will end support for python 2.7 on June 1st, 2020.",
             Warning,
             stacklevel=3,
         )
@@ -42,7 +42,7 @@ def main():
 
         if matches_output:
             if args.output_file:
-                with open(args.output_file, 'w', encoding='utf-8') as output_file:
+                with open(args.output_file, "w", encoding="utf-8") as output_file:
                     output_file.write(matches_output)
             else:
                 print(matches_output)
@@ -53,7 +53,7 @@ def main():
         return e.exit_code
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     try:
         sys.exit(main())
     except (ValueError, TypeError):

src/cfnlint/api.py

@@ -4,11 +4,11 @@
 """
 from typing import List
 
-from cfnlint.rules import Match, RulesCollection
 from cfnlint.config import configure_logging
 from cfnlint.core import get_rules
 from cfnlint.decode import decode_str
 from cfnlint.helpers import REGIONS
+from cfnlint.rules import Match, RulesCollection
 from cfnlint.runner import Runner
 
 Matches = List[Match]
@@ -65,6 +65,6 @@ def lint_all(s: str) -> Matches:
     """
     return lint(
         s=s,
-        rules=get_rules([], [], ['I', 'W', 'E'], include_experimental=True),
+        rules=get_rules([], [], ["I", "W", "E"], include_experimental=True),
         regions=REGIONS,
     )