diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-27 17:01:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-27 17:01:22 +0100 |
| commit | 1c9e0d95263480a5ae5d645cabb41f835d1dbb70 (patch) | |
| tree | 25f46dc18d8f8430d46ad365452ce0d8a7c9d9d0 /sources/pyside2/PySide2/support/signature/loader.py | |
| parent | ad14f64972d182fca3e180c08750ca020a91b84e (diff) | |
| parent | 2490c34325bb1b39922582090a4cb69c01726999 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I79637555fbfbd596dee4313baf80149d03bb5206
Diffstat (limited to 'sources/pyside2/PySide2/support/signature/loader.py')
| -rw-r--r-- | sources/pyside2/PySide2/support/signature/loader.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/support/signature/loader.py b/sources/pyside2/PySide2/support/signature/loader.py index 373cc8abe..b734436e8 100644 --- a/sources/pyside2/PySide2/support/signature/loader.py +++ b/sources/pyside2/PySide2/support/signature/loader.py @@ -60,7 +60,6 @@ for _ in "four": sys.path.insert(0, package_dir) if sys.version_info >= (3,): from PySide2.support.signature import inspect - from PySide2.support.signature import typing else: import inspect namespace = inspect.__dict__ |