From 4ff415c6d412a4f97baca739c3900957a1d5f593 Mon Sep 17 00:00:00 2001 From: clavedeluna Date: Tue, 25 Feb 2025 07:40:58 -0300 Subject: [PATCH 1/2] fix pythonjsonlogger warning --- src/codemodder/logging.py | 4 ++-- tests/test_logging.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/codemodder/logging.py b/src/codemodder/logging.py index 3ef35b83..4cc8e28b 100644 --- a/src/codemodder/logging.py +++ b/src/codemodder/logging.py @@ -3,7 +3,7 @@ from enum import Enum from typing import Generator, Optional -from pythonjsonlogger import jsonlogger +from pythonjsonlogger import json logger = logging.getLogger("codemodder") @@ -21,7 +21,7 @@ def __str__(self): return self.value.lower() -class CodemodderJsonFormatter(jsonlogger.JsonFormatter): +class CodemodderJsonFormatter(json.JsonFormatter): project_name: Optional[str] def __init__(self, *args, project_name: Optional[str] = None, **kwargs): diff --git a/tests/test_logging.py b/tests/test_logging.py index 79d678ff..1fa1f695 100644 --- a/tests/test_logging.py +++ b/tests/test_logging.py @@ -1,4 +1,4 @@ -from pythonjsonlogger import jsonlogger +from pythonjsonlogger import json from codemodder.logging import OutputFormat, configure_logger @@ -10,7 +10,7 @@ def test_json_logger(mocker): assert basic_config.call_args[1]["format"] == "%(message)s" assert isinstance( basic_config.call_args[1]["handlers"][0].formatter, - jsonlogger.JsonFormatter, + json.JsonFormatter, ) assert ( basic_config.call_args[1]["handlers"][0].formatter.project_name From 39dabe71ba55081666b930f4cf478bf2f6c733e7 Mon Sep 17 00:00:00 2001 From: clavedeluna Date: Tue, 25 Feb 2025 08:15:36 -0300 Subject: [PATCH 2/2] warn to warning --- src/codemodder/codemods/regex_transformer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codemodder/codemods/regex_transformer.py b/src/codemodder/codemods/regex_transformer.py index 02e81dd3..e2121863 100644 --- a/src/codemodder/codemods/regex_transformer.py +++ b/src/codemodder/codemods/regex_transformer.py @@ -100,7 +100,7 @@ def _apply(self, original_lines, file_context, results): changed_line = self._apply_regex(line) updated_lines.append(changed_line) if line == changed_line: - logger.warn("Unable to update html line: %s", line) + logger.warning("Unable to update html line: %s", line) self.report_unfixed( file_context, one_idx_lineno,