Merge pull request #27478 from asmorkalov:as/old_python_operators_eval

asmorkalov · web-flow · commit 5ee1a53d1e44 · 2025-06-25T12:29:42.000+03:00
Fixed ifdef logic operators evaluation with some old python versions.
diff --git a/modules/python/src2/hdr_parser.py b/modules/python/src2/hdr_parser.py
@@ -97,7 +97,8 @@ def evaluate_conditional_inclusion_directive(directive, preprocessor_definitions
         ...
     ValueError: Failed to evaluate '#if strangedefinedvar' directive, stripped down to 'strangedefinedvar'
     """
-    OPERATORS = { "!": "not ", "&&": "and", "&": "and", "||": "or", "|": "or" }
+    OPERATORS1 = {"&&": "and", "||": "or"}
+    OPERATORS2 = { "!": "not ", "&": "and", "|": "or" }
 
     input_directive = directive
 
@@ -134,7 +135,10 @@ def evaluate_conditional_inclusion_directive(directive, preprocessor_definitions
         directive
     )
 
-    for src_op, dst_op in OPERATORS.items():
+    for src_op, dst_op in OPERATORS1.items():
+        directive = directive.replace(src_op, dst_op)
+
+    for src_op, dst_op in OPERATORS2.items():
         directive = directive.replace(src_op, dst_op)
 
     try:
