fix lazy logging codemod bug with acceptable concatnation (#497)

pixee · Apr 22, 2024 · d16ff03 · d16ff03
1 parent b8a62db
commit d16ff03
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/src/core_codemods/lazy_logging.py b/src/core_codemods/lazy_logging.py
@@ -54,21 +54,34 @@ class LazyLogging(SimpleCodemod, NameAndAncestorResolutionMixin):
                 ...
             {_log_funcs}
           - patterns:
-            - pattern: logging.$FUNC(..., $ANYTHING + ..., ...)
+            - pattern: logging.$FUNC($MSG + ..., ...)
             {_pattern_inside}
             {_log_funcs}
           - patterns:
-            - pattern: logging.getLogger(...).$FUNC(..., $ANYTHING + ..., ...)
+            - pattern: logging.getLogger(...).$FUNC($MSG + ..., ...)
             {_pattern_inside}
             {_log_funcs}
           - patterns:
-            - pattern: $VAR.$FUNC(..., $ANYTHING + ..., ...)
+            - pattern: $VAR.$FUNC($MSG + ..., ...)
             - pattern-inside: |
                 import logging
                 ...
                 $VAR = logging.getLogger(...)
                 ...
             {_log_funcs}
+          - patterns:
+            - pattern: logging.log($LEVEL, $MSG + ..., ...)
+            {_pattern_inside}
+          - patterns:
+            - pattern: logging.getLogger(...).log($LEVEL, $MSG + ..., ...)
+            {_pattern_inside}
+          - patterns:
+            - pattern: $VAR.log($LEVEL, $MSG + ..., ...)
+            - pattern-inside: |
+                import logging
+                ...
+                $VAR = logging.getLogger(...)
+                ...
         """
 
     def on_result_found(self, original_node, updated_node):

diff --git a/tests/codemods/test_lazy_logging.py b/tests/codemods/test_lazy_logging.py
@@ -321,6 +321,27 @@ def test_var_assignments(self, tmpdir):
             import logging
             logging.info("% something", "hi")
             """,
+            """
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.debug(
+                "At depth %d, updating best step: %s (score: %f).",
+                10,
+                [swap] + next_step.swaps_added,
+                next_score,
+            )
+            """,
+            """
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.log(
+                logging.INFO,
+                "At depth %d, updating best step: %s (score: %f).",
+                10,
+                [swap] + next_step.swaps_added,
+                next_score,
+            )
+            """,
         ],
     )
     def test_no_change(self, tmpdir, code):