diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-25 16:33:12 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-25 16:33:12 +0200 |
| commit | 39ac266455cc1c0ae970a47c34d3a6bc7372d750 (patch) | |
| tree | 9577fe06bcb0e3096ef85af929a91eb37b037452 /sources/shiboken2/shibokenmodule/files.dir/shibokensupport/typing27.py | |
| parent | 9115712ef3a1be8b401c9cd306792dbc30c89bf0 (diff) | |
| parent | 6717d3540fac74c91d9381958a08e60f6532d402 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.14.2
Change-Id: Id0650ec2b46f3c67eb2c9b400f5b31aab98c3c58
Diffstat (limited to 'sources/shiboken2/shibokenmodule/files.dir/shibokensupport/typing27.py')
| -rw-r--r-- | sources/shiboken2/shibokenmodule/files.dir/shibokensupport/typing27.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/typing27.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/typing27.py index 44d78c433..41ed456cc 100644 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/typing27.py +++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/typing27.py @@ -184,11 +184,8 @@ __all__ = [ def _qualname(x): - if sys.version_info[:2] >= (3, 3): - return x.__qualname__ - else: - # Fall back to just name. - return x.__name__ + # PYSIDE-1286: Support __qualname__ in Python 2 + return getattr(x, "__qualname__", x.__name__) def _trim_name(nm): |