Use utils.LINE_NUMBER_KEY instead of __line__ constant

ansible · Jan 11, 2022 · c84cedb · c84cedb
1 parent 01e2b91
commit c84cedb
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/src/ansiblelint/rules/BecomeUserWithoutBecomeRule.py b/src/ansiblelint/rules/BecomeUserWithoutBecomeRule.py
@@ -22,6 +22,7 @@
 from typing import TYPE_CHECKING, Any, List
 
 from ansiblelint.rules import AnsibleLintRule
+from ansiblelint.utils import LINE_NUMBER_KEY
 
 if TYPE_CHECKING:
     from ansiblelint.constants import odict
@@ -102,7 +103,7 @@ def matchplay(
                     self.create_matcherror(
                         message=self.shortdesc,
                         filename=str(file.path),
-                        linenumber=data['__line__'],
+                        linenumber=data[LINE_NUMBER_KEY],
                     )
                 ]
         return []
diff --git a/src/ansiblelint/rules/MetaChangeFromDefaultRule.py b/src/ansiblelint/rules/MetaChangeFromDefaultRule.py
@@ -3,6 +3,7 @@
 from typing import TYPE_CHECKING, List
 
 from ansiblelint.rules import AnsibleLintRule
+from ansiblelint.utils import LINE_NUMBER_KEY
 
 if TYPE_CHECKING:
     from typing import Any
@@ -46,7 +47,7 @@ def matchplay(
                 results.append(
                     self.create_matcherror(
                         filename=file,
-                        linenumber=data['__line__'],
+                        linenumber=data[LINE_NUMBER_KEY],
                         message='Should change default metadata: %s' % field,
                     )
                 )

diff --git a/src/ansiblelint/rules/MetaVideoLinksRule.py b/src/ansiblelint/rules/MetaVideoLinksRule.py
@@ -4,6 +4,7 @@
 from typing import TYPE_CHECKING, List
 
 from ansiblelint.rules import AnsibleLintRule
+from ansiblelint.utils import FILENAME_KEY, LINE_NUMBER_KEY
 
 if TYPE_CHECKING:
     from typing import Any
@@ -57,7 +58,7 @@ def matchplay(
                 )
                 continue
 
-            if set(video) != {'url', 'title', '__file__', '__line__'}:
+            if set(video) != {'url', 'title', FILENAME_KEY, LINE_NUMBER_KEY}:
                 results.append(
                     self.create_matcherror(
                         "Expected item in 'video_links' to contain "

diff --git a/src/ansiblelint/rules/NoSameOwnerRule.py b/src/ansiblelint/rules/NoSameOwnerRule.py
@@ -6,6 +6,7 @@
 from ansiblelint.errors import MatchError
 from ansiblelint.file_utils import Lintable
 from ansiblelint.rules import AnsibleLintRule
+from ansiblelint.utils import LINE_NUMBER_KEY
 
 
 class NoSameOwnerRule(AnsibleLintRule):
@@ -58,14 +59,14 @@ def handle_task(self, lintable: Lintable, task: Any) -> List[MatchError]:
                 print(task)
                 results.append(
                     self.create_matcherror(
-                        filename=lintable, linenumber=task['__line__']
+                        filename=lintable, linenumber=task[LINE_NUMBER_KEY]
                     )
                 )
         elif 'unarchive' in task:
             if self.handle_unarchive(task):
                 results.append(
                     self.create_matcherror(
-                        filename=lintable, linenumber=task['__line__']
+                        filename=lintable, linenumber=task[LINE_NUMBER_KEY]
                     )
                 )
 

diff --git a/src/ansiblelint/rules/RoleLoopVarPrefix.py b/src/ansiblelint/rules/RoleLoopVarPrefix.py
@@ -6,6 +6,7 @@
 from ansiblelint.file_utils import Lintable
 from ansiblelint.rules import AnsibleLintRule
 from ansiblelint.text import toidentifier
+from ansiblelint.utils import LINE_NUMBER_KEY
 
 if TYPE_CHECKING:
     from typing import Any
@@ -82,7 +83,7 @@ def handle_task(
             if not loop_var or not loop_var.startswith(self.prefix):
                 results.append(
                     self.create_matcherror(
-                        filename=lintable, linenumber=task['__line__']
+                        filename=lintable, linenumber=task[LINE_NUMBER_KEY]
                     )
                 )
         return results
diff --git a/src/ansiblelint/rules/VariableNamingRule.py b/src/ansiblelint/rules/VariableNamingRule.py
@@ -7,7 +7,7 @@
 from ansiblelint.config import options
 from ansiblelint.file_utils import Lintable
 from ansiblelint.rules import AnsibleLintRule
-from ansiblelint.utils import parse_yaml_from_file
+from ansiblelint.utils import LINE_NUMBER_KEY, parse_yaml_from_file
 
 if TYPE_CHECKING:
     from ansiblelint.constants import odict
@@ -78,7 +78,7 @@ def matchplay(
                 results.append(
                     self.create_matcherror(
                         filename=file,
-                        linenumber=our_vars['__line__'],
+                        linenumber=our_vars[LINE_NUMBER_KEY],
                         message="Play defines variable '"
                         + key
                         + "' within 'vars' section that violates variable naming standards",
@@ -124,7 +124,7 @@ def matchyaml(self, file: Lintable) -> List["MatchError"]:
                     results.append(
                         self.create_matcherror(
                             filename=file,
-                            # linenumber=vars['__line__'],
+                            # linenumber=vars[LINE_NUMBER_KEY],
                             message="File defines variable '"
                             + key
                             + "' that violates variable naming standards",

diff --git a/src/ansiblelint/utils.py b/src/ansiblelint/utils.py
@@ -626,8 +626,8 @@ def task_to_str(task: Dict[str, Any]) -> str:
                 "__ansible_module__",
                 "__ansible_module_original__",
                 "__ansible_arguments__",
-                "__line__",
-                "__file__",
+                LINE_NUMBER_KEY,
+                FILENAME_KEY,
             ]
         ]
     )