aider/aider/linter.py
Paul Gauthier f69da2cd86 aider: Fix 'dict_items' object has no attribute 'next' error by using 'next(iter(...))' to iterate over dictionary items in Python 3.
# Aider chat conversation:

USER: Traceback (most recent call last):
  File "<frozen runpy>", line 198, in _run_module_as_main
  File "<frozen runpy>", line 88, in _run_code
  File "/Users/gauthier/Projects/aider/aider/linter.py", line 203, in <module>
    main()
  File "/Users/gauthier/Projects/aider/aider/linter.py", line 197, in main
    errors = linter.lint(file_path)
             ^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/gauthier/Projects/aider/aider/linter.py", line 76, in lint
    return self.run_cmd(cmd, rel_fname, code)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/gauthier/Projects/aider/aider/linter.py", line 57, in run_cmd
    filename, linenums = filenames_linenums.items().next()
                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AttributeError: 'dict_items' object has no attribute 'next'

ASSISTANT: To fix the `AttributeError: 'dict_items' object has no attribute 'next'`, we need to update the code to use the correct method for iterating over dictionary items in Python 3. The `next()` method should be replaced with `next(iter(...))`.

Here is the *SEARCH/REPLACE* block:

aider/linter.py
```python
<<<<<<< SEARCH
        if filenames_linenums:
            filename, linenums = filenames_linenums.items().next()
            res += tree_context(rel_fname, code, linenums)
=======
        if filenames_linenums:
            filename, linenums = next(iter(filenames_linenums.items()))
            res += tree_context(rel_fname, code, linenums)
>>>>>>> REPLACE
```
2024-05-18 19:40:04 -07:00

203 lines
5.2 KiB
Python

import os
import subprocess
import sys
import traceback
import warnings
from pathlib import Path
from grep_ast import TreeContext, filename_to_lang
from tree_sitter_languages import get_parser # noqa: E402
# tree_sitter is throwing a FutureWarning
warnings.simplefilter("ignore", category=FutureWarning)
class Linter:
def __init__(self, encoding="utf-8", root=None):
self.encoding = encoding
self.root = root
fatal = "E9,F821,F823,F831,F406,F407,F701,F702,F704,F706"
py_cmd = f"flake8 --select={fatal} --show-source" # noqa: F841
self.languages = dict(
#python=self.py_lint,
#python="/Users/gauthier/Projects/aider/tmp.sh",
#python="flake8 --show-source",
python=py_cmd,
)
def set_linter(self, lang, cmd):
self.languages[lang] = cmd
def get_rel_fname(self, fname):
if self.root:
return os.path.relpath(fname, self.root)
else:
return fname
def run_cmd(self, cmd, rel_fname, code):
cmd += " " + rel_fname
cmd = cmd.split()
process = subprocess.Popen(
cmd, cwd=self.root, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
)
stdout, _ = process.communicate()
errors = stdout.decode()
if process.returncode == 0:
return # zero exit status
cmd = " ".join(cmd)
res = f"# Running: {cmd}\n\n"
res += errors
filenames_linenums = find_filenames_and_linenums(errors, [rel_fname])
if filenames_linenums:
filename, linenums = next(iter(filenames_linenums.items()))
res += tree_context(rel_fname, code, linenums)
return res
def lint(self, fname):
lang = filename_to_lang(fname)
if not lang:
return
rel_fname = self.get_rel_fname(fname)
code = Path(fname).read_text(self.encoding)
cmd = self.languages.get(lang)
if callable(cmd):
return cmd(fname, rel_fname, code)
if cmd:
return self.run_cmd(cmd, rel_fname, code)
return basic_lint(rel_fname, code)
def py_lint(self, fname, rel_fname, code):
res = basic_lint(rel_fname, code)
if res:
return res
return lint_python_compile(fname, code)
def lint_python_compile(fname, code):
try:
compile(code, fname, "exec") # USE TRACEBACK BELOW HERE
return
except Exception as err:
line_numbers = list(range(err.lineno - 1, err.end_lineno))
tb_lines = traceback.format_exception(type(err), err, err.__traceback__)
last_file_i = 0
target = "# USE TRACEBACK"
target += " BELOW HERE"
for i in range(len(tb_lines)):
if target in tb_lines[i]:
last_file_i = i
break
tb_lines = tb_lines[:1] + tb_lines[last_file_i + 1 :]
res = "# Fix this error:\n\n"
res += "".join(tb_lines)
res += "\n"
res += tree_context(fname, code, line_numbers)
return res
def basic_lint(fname, code):
"""
Use tree-sitter to look for syntax errors, display them with tree context.
"""
lang = filename_to_lang(fname)
if not lang:
return
parser = get_parser(lang)
tree = parser.parse(bytes(code, "utf-8"))
errors = traverse_tree(tree.root_node)
if not errors:
return
return tree_context(fname, code, errors)
def tree_context(fname, code, line_nums):
context = TreeContext(
fname,
code,
color=False,
line_number=True,
child_context=False,
last_line=False,
margin=0,
mark_lois=True,
loi_pad=5,
# header_max=30,
show_top_of_file_parent_scope=False,
)
line_nums = set(line_nums)
context.add_lines_of_interest(line_nums)
context.add_context()
s = "s" if len(line_nums) > 1 else ""
output = f"## See relevant line{s} below marked with █.\n\n"
output += fname + ":\n"
output += context.format()
return output
# Traverse the tree to find errors
def traverse_tree(node):
errors = []
if node.type == "ERROR" or node.is_missing:
line_no = node.start_point[0]
errors.append(line_no)
for child in node.children:
errors += traverse_tree(child)
return errors
import re
def find_filenames_and_linenums(text, fnames):
"""
Search text for all occurrences of <filename>:\d+ and make a list of them
where <filename> is one of the filenames in the list `fnames`.
"""
pattern = re.compile(r'(\b(?:' + '|'.join(re.escape(fname) for fname in fnames) + r'):\d+\b)')
matches = pattern.findall(text)
result = {}
for match in matches:
fname, linenum = match.rsplit(':', 1)
if fname not in result:
result[fname] = set()
result[fname].add(int(linenum))
return result
def main():
"""
Main function to parse files provided as command line arguments.
"""
if len(sys.argv) < 2:
print("Usage: python linter.py <file1> <file2> ...")
sys.exit(1)
linter = Linter(root=os.getcwd())
for file_path in sys.argv[1:]:
errors = linter.lint(file_path)
if errors:
print(errors)
if __name__ == "__main__":
main()