diff options
| author | Christian Tismer <tismer@stackless.com> | 2017-11-28 12:10:17 +0100 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2017-11-28 11:46:15 +0000 |
| commit | 03a0c8025281025b8e6567a1d5c2d81368e9cec9 (patch) | |
| tree | 33a83d92b052eeae910939a6a7c129e2f2e10b52 /sources | |
| parent | 313d70089b365e2fcb9c7226911b201301204bc6 (diff) | |
signature: Support a new constant for QOpenGL
There are QOpenGLFunctions::glGetString() etc.
Some platforms have new, unrecognized constants.
I also reverted a change to parser.py to accept all regular exceptions, again.
It makes little sense to be explicit, here.
Change-Id: I7e0289ed074c1452ad163f68fdc6d35f046844e2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources')
| -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 318f934d5..144e6d855 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): |