Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 03:20:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optional fixing of wx prefix in cleanName

Browse Source 
This fixes erroneous wx. prepended to `version` variable in methods'
parameters.
This commit is contained in:
lojack5
2023-10-18 12:17:05 -06:00
parent 1fa0df5db5
commit 3958d89217
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
etgtools/tweaker_tools.py
View File

@@ -141,7 +141,7 @@ class FixWxPrefix(object):
FixWxPrefix._coreTopLevelNames = names
def cleanName(self, name: str, is_expression: bool = False) -> str:
def cleanName(self, name: str, is_expression: bool = False, fix_wx: bool = True) -> str:
"""Process a C++ name for use in Python code. In all cases, this means
handling name collisions with Python keywords. For names that will be
used for an identifier (ex: class, method, constant) - `is_expression`
@@ -161,7 +161,10 @@ class FixWxPrefix(object):
if not (is_expression and name in ['True', 'False', 'None']) and keyword.iskeyword(name):
name = f'_{name}' # Python keyword name collision
name = name.strip()
return self.fixWxPrefix(name, True)
if fix_wx:
return self.fixWxPrefix(name, True)
else:
return removeWxPrefix(name)
def cleanType(self, type_name: str) -> str:
"""Process a C++ type name for use as a type annotation in Python code.
@@ -225,7 +228,7 @@ class FixWxPrefix(object):
Ex. The transformation "any_identifier : ..." -> "*args" requires
modifying both the identifier name and the annotation.
"""
name_string = self.cleanName(name_string)
name_string = self.cleanName(name_string, fix_wx=False)
if type_string:
type_string = self.cleanType(type_string)
if type_string == '...':