diff options
| author | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2019-07-09 10:20:39 +0200 |
|---|---|---|
| committer | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2019-07-09 10:20:39 +0200 |
| commit | 032cc0bed452e96456cdc499f98ccaf473416978 (patch) | |
| tree | 514f4532d1ab4dcbea0495488e6dd30bc422a94b /silx/gui/qt/inspect.py | |
| parent | 8ff15764a99df31a5d75e1e19a89b413408cfcc2 (diff) | |
| parent | 654a6ac93513c3cc1ef97cacd782ff674c6f4559 (diff) | |
Update upstream source from tag 'upstream/0.11.0+dfsg'
Update to upstream version '0.11.0+dfsg'
with Debian dir 711605a3a57c11c3b5d699da5819c94403f8ac62
Diffstat (limited to 'silx/gui/qt/inspect.py')
| -rw-r--r-- | silx/gui/qt/inspect.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/silx/gui/qt/inspect.py b/silx/gui/qt/inspect.py index c6c2cbe..3c08835 100644 --- a/silx/gui/qt/inspect.py +++ b/silx/gui/qt/inspect.py @@ -1,7 +1,7 @@ # coding: utf-8 # /*########################################################################## # -# Copyright (c) 2018 European Synchrotron Radiation Facility +# Copyright (c) 2018-2019 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -62,9 +62,14 @@ if qt.BINDING in ('PyQt4', 'PyQt5'): return not _isdeleted(obj) elif qt.BINDING == 'PySide2': - from PySide2.shiboken2 import isValid # noqa - from PySide2.shiboken2 import createdByPython # noqa - from PySide2.shiboken2 import ownedByPython # noqa + try: + from PySide2.shiboken2 import isValid # noqa + from PySide2.shiboken2 import createdByPython # noqa + from PySide2.shiboken2 import ownedByPython # noqa + except ImportError: + from shiboken2 import isValid # noqa + from shiboken2 import createdByPython # noqa + from shiboken2 import ownedByPython # noqa elif qt.BINDING == 'PySide': try: # Available through PySide |