From 1fcb676d353541d3a99b593b6a6f3a7c9270fb9a Mon Sep 17 00:00:00 2001 From: chendelian <116870791@qq.com> Date: Mon, 23 Mar 2026 18:30:29 +0800 Subject: [PATCH] Fix account-manager merge conflicts Made-with: Cursor --- scripts/account.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/account.py b/scripts/account.py index 85d6667..17a79de 100644 --- a/scripts/account.py +++ b/scripts/account.py @@ -8,7 +8,6 @@ if sys.platform == "win32": import io sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace') sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding='utf-8', errors='replace') - BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) ACCOUNTS_FILE = os.path.join(BASE_DIR, "accounts.json") @@ -53,7 +52,6 @@ def cmd_list(platform="all"): if not found: print(f"ERROR:NO_ACCOUNTS_FOUND") - def cmd_get(account_id): accounts = load_accounts() for platform_accounts in accounts.values(): @@ -106,7 +104,6 @@ async def main(): print("登录态已保存!") asyncio.run(main()) """ - import tempfile with tempfile.NamedTemporaryFile(mode='w', suffix='.py', delete=False, encoding='utf-8') as f: