[demianw]

What was wrong

These are the Python 2 leftovers listed in #115:

• query_processor.py visit_Call checks the starargs / kwargs attributes of ast.Call. They were removed in Python 3.5. f(*x) now shows up as an ast.Starred in args, and f(**x) as a keyword in keywords, which the same condition already checks (len(node.keywords) == 0, and a Starred argument is rejected by generic_visit).
• query_processor.py EvaluateQueries.__metaclass__ = DocStringInheritor: Python 3 ignores the attribute, so it has no effect.
• tract_math/decorator.py: hasattr(writer, 'writeheader') is always true on Python 3.
• shell.py: except SyntaxError as e: print(e.value) (in do_save and default) would raise AttributeError, because SyntaxError has no value. safe_method then reports it as "Uncaught exception, please contact the development team". In practice queries_preprocess converts syntax errors to TractQuerierSyntaxError, so this handler is a fallback, but it should not crash.
• shell.py names() (used by the shell's dir command and tab completion): this is not a Python 2 issue but a leftover of the old query naming. Before 692ffd0, side queries were stored as x_left / x_right, and names() showed them as x.left / x.right. Now they are stored as x.left / x.right, so this branch never matches them. It only mangled user queries whose names end in _left: c_left = 1; c_right = 2 was listed as c.left, c.right, which do not exist, and c_right was hidden.

Change

• query_processor.py: drop the two starargs/kwargs lines, the __metaclass__ line, the from .code_util import DocStringInheritor import, and the commented-out # @add_metaclass(DocStringInheritor).
• tract_math/decorator.py: call writer.writeheader() unconditionally.
• shell.py: print(e) for SyntaxError. names() returns the evaluated query names unchanged.

No behaviour change apart from the two shell fixes: no crash on a SyntaxError, and dir / tab completion list the real names of queries ending in _left / _right. For dotted side queries (x.left, everything in the packaged .qry files) names() returns exactly what it returned before.

Testing

• New tract_querier/tests/test_shell.py:

  • names() on a shell with a.left, a.right, b, c_left, c_right;
  • a SyntaxError from queries_preprocess (monkeypatched) is printed by default and do_save without "Uncaught exception".

  Both tests fail with master's shell.py.

• Called process_output with a dict of lists and with a dict of scalars: the CSV/TSV header and rows are printed as before.

• python -m pytest -q -p no:cacheprovider tract_querier: 44 passed, 1 skipped.

Merge order:

• The __metaclass__ / code_util import removal is the same change as in ENH: Remove dead code from the core package #136 (ENH: remove dead and broken code #107, removes code_util/). The hunks are identical, and this PR also removes the commented-out decorator line. Whichever lands second should merge cleanly or need a trivial resolution. code_util/ itself is left to ENH: Remove dead code from the core package #136.
• The decorator.py line overlaps ENH: Make the command-line tools usable in batch runs #138, which re-indents that block into a with f: (and keeps the hasattr). If ENH: Make the command-line tools usable in batch runs #138 lands first, the resolution is to keep its with block and drop the hasattr/else.
• visit_Call is also touched by BUG: Make save('name') in queries mark the query for output #137 (BUG: save(...) in queries can never work #104).

Closes #115

🤖 Generated with Claude Code