summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2019-11-18 19:35:55 +0100
committerFlorian Bruhin <me@the-compiler.org>2019-11-22 18:09:23 +0100
commit191af9877501aa3e34c0edac6b8ba2b0001582ce (patch)
treef5d25c39497180ec56a349893f94c7158a4f3e53
parent4d289aed54778f1ebd0d950c2a46c98db1a814be (diff)
downloadqutebrowser-191af9877501aa3e34c0edac6b8ba2b0001582ce.tar.gz
qutebrowser-191af9877501aa3e34c0edac6b8ba2b0001582ce.zip
Ignore imp deprecation warning in earlyinit
See https://github.com/mhammond/pywin32/issues/1256 (cherry picked from commit 732ca70210c5664f871d7b0a987a41252ed4ac4f)
-rw-r--r--doc/changelog.asciidoc3
-rw-r--r--qutebrowser/misc/earlyinit.py3
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index f4825d0af..05dc42a71 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -60,6 +60,9 @@ Fixed
- Crash when setting `colors.webpage.bg` to an empty value with QtWebKit.
- Crash when the history database file is not a proper sqlite database.
- Workaround for missing/broken error pages on Debian.
+- Issues with Python 3.8 and QtWebKit.
+- A deprecation warning (caused by pywin32) about the imp module on Windows is
+ now hidden.
v1.8.1 (2019-09-27)
-------------------
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index 54c94706c..cac825adf 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -230,6 +230,9 @@ def _check_modules(modules):
), log.ignore_py_warnings(
category=ImportWarning,
message=r'Not importing directory .*: missing __init__'
+ ), log.ignore_py_warnings(
+ category=DeprecationWarning,
+ message=r'the imp module is deprecated',
):
# pylint: enable=bad-continuation
importlib.import_module(name)