|
82 | 82 |
|
83 | 83 | from cython_lint import __version__ |
84 | 84 |
|
85 | | -CYTHON_VERSION = tuple(Cython.__version__.split(".")) # type: ignore[attr-defined] |
| 85 | +# non-numeric parts (e.g. the 'b1' of '3.1.0b1') are dropped |
| 86 | +CYTHON_VERSION = tuple( |
| 87 | + int(part) |
| 88 | + for part in Cython.__version__.split(".") # type: ignore[attr-defined] |
| 89 | + if part.isdigit() |
| 90 | +) |
| 91 | +CYTHON_3 = (3,) |
| 92 | +CYTHON_3_3 = (3, 3) |
86 | 93 | if TYPE_CHECKING: |
87 | 94 | from collections.abc import Hashable |
88 | 95 | from collections.abc import Iterator |
|
99 | 106 | r")/" |
100 | 107 | ) |
101 | 108 |
|
102 | | -if CYTHON_VERSION > ("3",): # pragma: no cover |
| 109 | +if CYTHON_VERSION >= CYTHON_3: |
103 | 110 | from Cython.Compiler.ExprNodes import AnnotationNode # type: ignore[assignment] |
104 | 111 | else: # pragma: no cover |
105 | 112 |
|
@@ -336,6 +343,15 @@ def _args_from_sequence_node(node: SequenceNode) -> list[ExprNode]: |
336 | 343 | return node.args # type: ignore[attr-defined] |
337 | 344 |
|
338 | 345 |
|
| 346 | +def _value_from_dict_comprehension_append_node( |
| 347 | + node: DictComprehensionAppendNode, |
| 348 | +) -> ExprNode: |
| 349 | + if CYTHON_VERSION >= CYTHON_3_3: |
| 350 | + # Cython 3.3 replaced key_expr/value_expr with a single DictItemNode |
| 351 | + return node.dict_item.value # type: ignore[attr-defined] |
| 352 | + return node.value_expr # type: ignore[attr-defined] # pragma: no cover |
| 353 | + |
| 354 | + |
339 | 355 | def _rhs_from_single_assignment_node(node: SingleAssignmentNode) -> ExprNode: |
340 | 356 | return node.rhs # type: ignore[attr-defined] |
341 | 357 |
|
@@ -629,7 +645,7 @@ def _traverse_file( # noqa: PLR0915,PLR0913 |
629 | 645 | ) |
630 | 646 |
|
631 | 647 | if isinstance(node, (IfClauseNode, AssertStatNode)): |
632 | | - if CYTHON_VERSION > ("3",) or isinstance( |
| 648 | + if CYTHON_VERSION >= CYTHON_3 or isinstance( |
633 | 649 | node, IfClauseNode |
634 | 650 | ): # pragma: no cover |
635 | 651 | test = isinstance(node.condition, TupleNode) |
@@ -683,13 +699,13 @@ def _traverse_file( # noqa: PLR0915,PLR0913 |
683 | 699 | and isinstance(node.loop.body, ComprehensionAppendNode) |
684 | 700 | ): |
685 | 701 | if isinstance(node.loop.body, DictComprehensionAppendNode): |
686 | | - expr = node.loop.body.value_expr |
| 702 | + _expr = _value_from_dict_comprehension_append_node(node.loop.body) |
687 | 703 | else: |
688 | | - expr = node.loop.body.expr |
689 | | - if isinstance(expr, LambdaNode) and not hasattr(expr, "loop"): |
| 704 | + _expr = node.loop.body.expr |
| 705 | + if isinstance(_expr, LambdaNode) and not hasattr(_expr, "loop"): |
690 | 706 | # GeneratorExpressionNode is a LambdaNode, and has a loop |
691 | 707 | # attribute, so need to exclude it. |
692 | | - _children = [j.node for j in traverse(expr)] |
| 708 | + _children = [j.node for j in traverse(_expr)] |
693 | 709 | _names = [ |
694 | 710 | _name_from_name_node(_child) |
695 | 711 | for _child in _children |
|
0 commit comments