sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-23 00:02:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix SIP_PYALTERNATIVETYPE handling

Browse Source
This commit is contained in:
Nyall Dawson 2024-08-12 20:46:27 +10:00
parent 60d632a400
commit 25b12294a2
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/sipify.py
View File

@ -902,6 +902,21 @@ def remove_following_body_or_initializerlist():
return signature
def replace_alternative_types(text):
"""
Handle SIP_PYALTERNATIVETYPE annotation
"""
# Original perl regex was:
# s/(\w+)(\<(?>[^<>]|(?2))*\>)?\s+SIP_PYALTERNATIVETYPE\(\s*\'?([^()']+)(\(\s*(?:[^()]++|(?2))*\s*\))?\'?\s*\)/$3/g;
_pattern = r'(\w+)(<(?:[^<>]|<(?:[^<>]|<[^<>]*>)*>)*>)?\s+SIP_PYALTERNATIVETYPE\(\s*\'?([^()\']+)(\(\s*(?:[^()]|\([^()]*\))*\s*\))?\'?\s*\)'
while True:
new_text = re.sub(_pattern, r'\3', text, flags=re.S)
if new_text == text:
return text
text = new_text
def fix_annotations(line):
global skipped_params_remove, skipped_params_out, is_qt6, multiline_definition, output
@ -958,9 +973,7 @@ def fix_annotations(line):
dbg_info("combine multiple annotations -- works only for 2")
# Unprinted annotations
# Original perl regex was:
# s/(\w+)(\<(?>[^<>]|(?2))*\>)?\s+SIP_PYALTERNATIVETYPE\(\s*\'?([^()']+)(\(\s*(?:[^()]++|(?2))*\s*\))?\'?\s*\)/$3/g;
line = re.sub(r'(\w+)(<[^>]*>)?\s+SIP_PYALTERNATIVETYPE\(\s*\'?([^()\']+)(\([^()]*\))?\'?\s*\)', r'\3', line)
line = replace_alternative_types(line)
line = re.sub(r'(\w+)\s+SIP_PYARGRENAME\(\s*(\w+)\s*\)', r'\2', line)
# Note: this was the original perl regex, which isn't compatible with Python: