From 8a23b9113432a84fb84aeda9f3e314aec78b1963 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 11 Mar 2018 08:15:22 +0100 Subject: Handle ImportError in version.opengl_vendor Fixes #3698 (cherry picked from commit d9f7d401c612706f08600225dd8ee3dbcb428b46) --- doc/changelog.asciidoc | 9 +++++++++ qutebrowser/utils/version.py | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 595373031..1550b3a09 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -15,6 +15,15 @@ breaking changes (such as renamed commands) can happen in minor releases. // `Fixed` for any bug fixes. // `Security` to invite users to upgrade in case of vulnerabilities. +v1.3.0 (unreleased) +------------------- + +Fixed +~~~~~ + +- qutebrowser now starts properly when the PyQt5 QOpenGLFunctions package wasn't found. + + v1.2.0 ------ diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 65ceb576a..a49ccc1bc 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -453,7 +453,13 @@ def opengl_vendor(): # pragma: no cover vp = QOpenGLVersionProfile() vp.setVersion(2, 0) - vf = ctx.versionFunctions(vp) + try: + vf = ctx.versionFunctions(vp) + except ImportError as e: + log.init.debug("opengl_vendor: Importing version functions " + "failed: {}".format(e)) + return None + if vf is None: log.init.debug("opengl_vendor: Getting version functions failed!") return None -- cgit v1.2.3-54-g00ecf