Cleanup importing

src/cfnlint/api.py

@@ -11,8 +11,7 @@
 from cfnlint.decode.decode import decode_str
 from cfnlint.helpers import REGION_PRIMARY, REGIONS
 from cfnlint.rules import Match, RulesCollection
-from cfnlint.runner import Runner
-from cfnlint.runner.template import run_template_by_data
+from cfnlint.runner import Runner, run_template_by_data
 
 Matches = List[Match]
 

src/cfnlint/runner/__init__.py

@@ -3,6 +3,22 @@
 SPDX-License-Identifier: MIT-0
 """
 
-__all__ = ["main", "Runner"]
+__all__ = [
+    "main",
+    "Runner",
+    "run_template_by_data",
+    "run_template_by_file_path",
+    "run_deployment_file",
+    "CfnLintExitException",
+    "InvalidRegionException",
+    "UnexpectedRuleException",
+]
 
 from cfnlint.runner.cli import Runner, main
+from cfnlint.runner.deployment_file import run_deployment_file
+from cfnlint.runner.exceptions import (
+    CfnLintExitException,
+    InvalidRegionException,
+    UnexpectedRuleException,
+)
+from cfnlint.runner.template import run_template_by_data, run_template_by_file_path

src/cfnlint/runner/deployment_file/__init__.py

@@ -2,3 +2,7 @@
 Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
+
+__all__ = ["run_deployment_file"]
+
+from cfnlint.runner.deployment_file.runner import run_deployment_file

test/unit/module/rule/test_rule_child.py

@@ -9,7 +9,7 @@
 from cfnlint import ConfigMixIn
 from cfnlint.decode.decode import decode_str
 from cfnlint.rules import CloudFormationLintRule, Match, RuleMatch, Rules
-from cfnlint.runner.template import run_template_by_data
+from cfnlint.runner import run_template_by_data
 
 
 class TestCloudFormationRuleChild(BaseTestCase):

test/unit/module/runner/test_rule_configuration.py

@@ -7,8 +7,7 @@
 from test.testlib.testcase import BaseTestCase
 
 from cfnlint.config import ConfigMixIn
-from cfnlint.runner import Runner
-from cfnlint.runner.exceptions import UnexpectedRuleException
+from cfnlint.runner import Runner, UnexpectedRuleException
 
 
 class TestGetRules(BaseTestCase):

test/unit/module/runner/test_template_runner.py

@@ -10,7 +10,7 @@
 from cfnlint import ConfigMixIn
 from cfnlint.config import _DEFAULT_RULESDIR
 from cfnlint.rules import Rules
-from cfnlint.runner.template import run_template_by_data
+from cfnlint.runner import run_template_by_data
 
 
 class TestRunner(BaseTestCase):