diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-29 08:08:36 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-29 08:08:36 +0100 |
| commit | 1484dc600a35ea5bd1517ed945902151ff293c14 (patch) | |
| tree | 11f9de6473cea409ef5d977def8508f72d4d7630 /sources/pyside2/PySide2/support | |
| parent | 1c9e0d95263480a5ae5d645cabb41f835d1dbb70 (diff) | |
| parent | 0022a9ecb7690a3bd9a7d4ce0880d1cecc937462 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Ibef497a2439a05114eb2123e5f39c00aec8dc460
Diffstat (limited to 'sources/pyside2/PySide2/support')
| -rw-r--r-- | sources/pyside2/PySide2/support/signature/mapping.py | 1 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/support/signature/parser.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/support/signature/mapping.py b/sources/pyside2/PySide2/support/signature/mapping.py index 8cb0bbf8e..50ae27718 100644 --- a/sources/pyside2/PySide2/support/signature/mapping.py +++ b/sources/pyside2/PySide2/support/signature/mapping.py @@ -310,6 +310,7 @@ def init_QtGui(): "PySide2.QtGui.QPlatformSurface": Virtual("PySide2.QtGui.QPlatformSurface"), # hmm... "QList< QTouchEvent.TouchPoint >()": [], # XXX improve? "QPixmap()": Default("PySide2.QtGui.QPixmap"), # can't create without qApp + "PySide2.QtCore.uint8_t": int, # macOS 5.9 "zero(uint32_t)": 0, "zero(PySide2.QtGui.QWindow)": None, "zero(PySide2.QtGui.QOpenGLContext)": None, diff --git a/sources/pyside2/PySide2/support/signature/parser.py b/sources/pyside2/PySide2/support/signature/parser.py index 0b81dba54..c55973632 100644 --- a/sources/pyside2/PySide2/support/signature/parser.py +++ b/sources/pyside2/PySide2/support/signature/parser.py @@ -126,7 +126,7 @@ def make_good_value(thing, valtype): if valtype and repr(ret).startswith("<"): thing = 'Instance("{}")'.format(thing) return eval(thing, namespace) - except (SyntaxError, TypeError, NameError): + except Exception: pass def try_to_guess(thing, valtype): |