From 78d37153240b3c17bd992447e3defa1fb658a7a7 Mon Sep 17 00:00:00 2001 From: Asankilp Date: Sat, 15 Feb 2025 20:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B1=BB=E5=9E=8B=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nonebot_plugin_marshoai/config.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nonebot_plugin_marshoai/config.py b/nonebot_plugin_marshoai/config.py index 09adfad8..6bf55237 100644 --- a/nonebot_plugin_marshoai/config.py +++ b/nonebot_plugin_marshoai/config.py @@ -100,8 +100,8 @@ def check_yaml_is_changed(): """ with open(config_file_path, "r", encoding="utf-8") as f: old = yaml.load(f) - with StringIO(dump_config_to_yaml(ConfigModel())) as f: - example_ = yaml.load(f) + with StringIO(dump_config_to_yaml(ConfigModel())) as f2: + example_ = yaml.load(f2) keys1 = set(example_.keys()) keys2 = set(old.keys()) if keys1 == keys2: @@ -138,8 +138,9 @@ if config.marshoai_use_yaml_config: with open(config_file_path, "r", encoding="utf-8") as f: old_config = yaml_2.load(f) - with StringIO(dump_config_to_yaml(ConfigModel())) as f: - new_config = yaml.load(f) + + with StringIO(dump_config_to_yaml(ConfigModel())) as f2: + new_config = yaml_2.load(f2) merged_config = merge_configs(old_config, new_config)