tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/aider/help.py b/aider/help.py
2index c76188d1..9fded648 100755
3--- a/aider/help.py
4+++ b/aider/help.py
5@@ -6,7 +6,7 @@ import shutil
6 import warnings
7 from pathlib import Path
8
9-import importlib_resources
10+import importlib.resources
11
12 from aider import __version__, utils
13 from aider.dump import dump # noqa: F401
14@@ -31,7 +31,7 @@ def install_help_extra(io):
15
16
17 def get_package_files():
18- for path in importlib_resources.files("aider.website").iterdir():
19+ for path in importlib.resources.files("aider.website").iterdir():
20 if path.is_file():
21 yield path
22 elif path.is_dir():
23@@ -112,7 +112,7 @@ def get_index():
24 continue
25
26 doc = Document(
27- text=importlib_resources.files("aider.website")
28+ text=importlib.resources.files("aider.website")
29 .joinpath(fname)
30 .read_text(encoding="utf-8"),
31 metadata=dict(
32diff --git a/aider/main.py b/aider/main.py
33index afb3f836..7ade37af 100644
34--- a/aider/main.py
35+++ b/aider/main.py
36@@ -13,7 +13,7 @@ try:
37 except ImportError:
38 git = None
39
40-import importlib_resources
41+import importlib.resources
42 import shtab
43 from dotenv import load_dotenv
44 from prompt_toolkit.enums import EditingMode
45@@ -391,7 +391,7 @@ def register_litellm_models(git_root, model_metadata_fname, io, verbose=False):
46 model_metadata_files = []
47
48 # Add the resource file path
49- resource_metadata = importlib_resources.files("aider.resources").joinpath("model-metadata.json")
50+ resource_metadata = importlib.resources.files("aider.resources").joinpath("model-metadata.json")
51 model_metadata_files.append(str(resource_metadata))
52
53 model_metadata_files += generate_search_path_list(
54diff --git a/aider/resources/__init__.py b/aider/resources/__init__.py
55index f7ca4efb..cabf3c36 100644
56--- a/aider/resources/__init__.py
57+++ b/aider/resources/__init__.py
58@@ -1,3 +1,3 @@
59-# This ensures that importlib_resources.files("aider.resources")
60+# This ensures that importlib.resources.files("aider.resources")
61 # doesn't raise ImportError, even if there are no other files in this
62 # dir.
63diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py
64index cc694a9f..82124b28 100755
65--- a/benchmark/benchmark.py
66+++ b/benchmark/benchmark.py
67@@ -16,7 +16,7 @@ from types import SimpleNamespace
68 from typing import List, Optional
69
70 import git
71-import importlib_resources
72+import importlib.resources
73 import lox
74 import pandas as pd
75 import prompts
76@@ -320,7 +320,7 @@ def main(
77
78 test_dnames = sorted(str(d.relative_to(original_dname)) for d in exercise_dirs)
79
80- resource_metadata = importlib_resources.files("aider.resources").joinpath("model-metadata.json")
81+ resource_metadata = importlib.resources.files("aider.resources").joinpath("model-metadata.json")
82 model_metadata_files_loaded = models.register_litellm_models([resource_metadata])
83 dump(model_metadata_files_loaded)
84
85diff --git a/tests/basic/test_main.py b/tests/basic/test_main.py
86index c8966a53..ec7a04a1 100644
87--- a/tests/basic/test_main.py
88+++ b/tests/basic/test_main.py
89@@ -1303,7 +1303,7 @@ class TestMain(TestCase):
90 mock_files = MagicMock()
91 mock_files.joinpath.return_value = mock_resource_path
92
93- with patch("aider.main.importlib_resources.files", return_value=mock_files):
94+ with patch("aider.main.importlib.resources.files", return_value=mock_files):
95 # Capture stdout to check the output
96 with patch("sys.stdout", new_callable=StringIO) as mock_stdout:
97 main(