diff options
Diffstat (limited to 'qutebrowser/browser/qutescheme.py')
| -rw-r--r-- | qutebrowser/browser/qutescheme.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py index 6bf9fc5d7..77be4ffda 100644 --- a/qutebrowser/browser/qutescheme.py +++ b/qutebrowser/browser/qutescheme.py @@ -34,7 +34,7 @@ import collections import secrets from typing import TypeVar, Callable, Dict, List, Optional, Union, Sequence, Tuple -from PyQt5.QtCore import QUrlQuery, QUrl +from qutebrowser.qt.core import QUrlQuery, QUrl import qutebrowser from qutebrowser.browser import pdfjs, downloads, history @@ -128,7 +128,9 @@ def data_for_url(url: QUrl) -> Tuple[str, bytes]: Return: A (mimetype, data) tuple. """ - norm_url = url.adjusted(QUrl.NormalizePathSegments | QUrl.StripTrailingSlash) + norm_url = url.adjusted( + QUrl.UrlFormattingOption.NormalizePathSegments | + QUrl.UrlFormattingOption.StripTrailingSlash) if norm_url != url: raise Redirect(norm_url) @@ -423,8 +425,8 @@ def qute_help(url: QUrl) -> _HandlerRet: def _qute_settings_set(url: QUrl) -> _HandlerRet: """Handler for qute://settings/set.""" query = QUrlQuery(url) - option = query.queryItemValue('option', QUrl.FullyDecoded) - value = query.queryItemValue('value', QUrl.FullyDecoded) + option = query.queryItemValue('option', QUrl.ComponentFormattingOption.FullyDecoded) + value = query.queryItemValue('value', QUrl.ComponentFormattingOption.FullyDecoded) # https://github.com/qutebrowser/qutebrowser/issues/727 if option == 'content.javascript.enabled' and value == 'false': @@ -498,10 +500,11 @@ def qute_back(url: QUrl) -> _HandlerRet: @add_handler('configdiff') -def qute_configdiff(_url: QUrl) -> _HandlerRet: +def qute_configdiff(url: QUrl) -> _HandlerRet: """Handler for qute://configdiff.""" - data = config.instance.dump_userconfig().encode('utf-8') - return 'text/plain', data + include_hidden = QUrlQuery(url).queryItemValue('include_hidden') == 'true' + dump = config.instance.dump_userconfig(include_hidden=include_hidden) + return 'text/plain', dump.encode('utf-8') @add_handler('pastebin-version') @@ -579,6 +582,9 @@ def qute_warning(url: QUrl) -> _HandlerRet: title='Qt 5.15 sessions warning', datadir=standarddir.data(), sep=os.sep) + elif path == '/sandboxing': + src = jinja.render('warning-sandboxing.html', + title='Qt 6 macOS sandboxing warning') else: raise NotFoundError("Invalid warning page {}".format(path)) return 'text/html', src |