diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-30 07:55:46 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-30 07:55:46 +0200 |
| commit | 7af97fa4136d66bbad6c7907de6e7bd823de2e43 (patch) | |
| tree | 94123be1810104d257aa50fe4b387dd8a1bf2a6c /sources/shiboken2/shibokenmodule/files.dir/shibokensupport | |
| parent | 3bbcb7b0e6e0342569aa155d695bca46a7459eb0 (diff) | |
| parent | ff792fd2e6842b990aff61a4e953dab5efbd89ae (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I13721e13d2fab13945385fe529afe4ab431e0532
Diffstat (limited to 'sources/shiboken2/shibokenmodule/files.dir/shibokensupport')
| -rw-r--r-- | sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py index 8a814114a..20c791cc1 100644 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py +++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py @@ -349,7 +349,6 @@ def calculate_props(line): props.annotations = annotations props.varnames = varnames = tuple(tup[0] for tup in arglist) funcname = parsed.funcname - props.fullname = funcname shortname = funcname[funcname.rindex(".")+1:] props.name = shortname props.multi = parsed.multi @@ -366,7 +365,6 @@ def fix_variables(props, line): if retvar and isinstance(retvar, (ResultVariable, ArrayLikeVariable)): # Special case: a ResultVariable which is the result will always be an array! annos["return"] = retvar = typing.List[retvar.type] - fullname = props.fullname varnames = list(props.varnames) defaults = list(props.defaults) diff = len(varnames) - len(defaults) @@ -456,8 +454,7 @@ def pyside_type_init(type_key, sig_strings): multi_props.append(props) if multi > 0: continue - fullname = props.pop("fullname") - multi_props = {"multi": multi_props, "fullname": fullname} + multi_props = {"multi": multi_props} ret[shortname] = multi_props dprint(multi_props) multi_props = [] |