From c977e6b3a3e2be210be7df50b99805bf73e335f9 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Sat, 26 Apr 2025 11:48:29 -0400 Subject: [PATCH 1/2] enable ruff rule A001 variable shadowing builtin --- mycli/packages/special/main.py | 2 +- pyproject.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mycli/packages/special/main.py b/mycli/packages/special/main.py index 4d1c941b..2b03544c 100644 --- a/mycli/packages/special/main.py +++ b/mycli/packages/special/main.py @@ -108,7 +108,7 @@ def show_keyword_help(cur, arg): @special_command("exit", "\\q", "Exit.", arg_type=NO_QUERY, aliases=("\\q",)) @special_command("quit", "\\q", "Quit.", arg_type=NO_QUERY) -def quit(*_args): +def quit_(*_args): raise EOFError diff --git a/pyproject.toml b/pyproject.toml index 78881a48..57055255 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -80,7 +80,6 @@ ignore = [ 'E117', # over-indented 'W191', # tab-indentation # TODO - 'A001', # todo enableme variable shadowing builtin 'A002', # todo enableme function argument shadowing builtin 'A004', # todo enableme import shadowing builtin 'PIE796', # todo enableme Enum contains duplicate value From 802b34000e4200d83e4b0a499b6d8cbb292729dd Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Sat, 26 Apr 2025 11:54:30 -0400 Subject: [PATCH 2/2] enable ruff rule A002 function argument shadowing builtin --- mycli/packages/completion_engine.py | 4 ++-- mycli/packages/special/delimitercommand.py | 4 ++-- mycli/packages/special/iocommands.py | 4 ++-- pyproject.toml | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mycli/packages/completion_engine.py b/mycli/packages/completion_engine.py index 8f0013fe..1bae6ddf 100644 --- a/mycli/packages/completion_engine.py +++ b/mycli/packages/completion_engine.py @@ -289,5 +289,5 @@ def suggest_based_on_last_token(token, text_before_cursor, full_text, identifier return [{"type": "keyword"}] -def identifies(id, schema, table, alias): - return id == alias or id == table or (schema and (id == schema + "." + table)) +def identifies(identifier, schema, table, alias): + return identifier == alias or identifier == table or (schema and (identifier == schema + "." + table)) diff --git a/mycli/packages/special/delimitercommand.py b/mycli/packages/special/delimitercommand.py index 530bf1a1..a0686c86 100644 --- a/mycli/packages/special/delimitercommand.py +++ b/mycli/packages/special/delimitercommand.py @@ -26,10 +26,10 @@ def _split(self, sql): return [stmt.replace(";", self._delimiter).replace(placeholder, ";") for stmt in split] - def queries_iter(self, input): + def queries_iter(self, input_str): """Iterate over queries in the input string.""" - queries = self._split(input) + queries = self._split(input_str) while queries: for sql in queries: delimiter = self._delimiter diff --git a/mycli/packages/special/iocommands.py b/mycli/packages/special/iocommands.py index 8ff0e890..f26445ea 100644 --- a/mycli/packages/special/iocommands.py +++ b/mycli/packages/special/iocommands.py @@ -547,6 +547,6 @@ def get_current_delimiter(): @export -def split_queries(input): - for query in delimiter_command.queries_iter(input): +def split_queries(input_str): + for query in delimiter_command.queries_iter(input_str): yield query diff --git a/pyproject.toml b/pyproject.toml index 57055255..86936fe9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -80,7 +80,6 @@ ignore = [ 'E117', # over-indented 'W191', # tab-indentation # TODO - 'A002', # todo enableme function argument shadowing builtin 'A004', # todo enableme import shadowing builtin 'PIE796', # todo enableme Enum contains duplicate value ]