diff options
Diffstat (limited to 'qutebrowser/browser/navigate.py')
| -rw-r--r-- | qutebrowser/browser/navigate.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/qutebrowser/browser/navigate.py b/qutebrowser/browser/navigate.py index d2783e349..38393ffb4 100644 --- a/qutebrowser/browser/navigate.py +++ b/qutebrowser/browser/navigate.py @@ -23,7 +23,7 @@ import re import posixpath from typing import Optional, Set -from qutebrowser.qt.core import QUrl +from qutebrowser.qt import core from qutebrowser.browser import webelem from qutebrowser.config import config @@ -42,24 +42,24 @@ class Error(Exception): # of information. (host and path use FullyDecoded by default) _URL_SEGMENTS = [ ('host', - lambda url: url.host(QUrl.ComponentFormattingOption.FullyEncoded), - lambda url, host: url.setHost(host, QUrl.ParsingMode.StrictMode)), + lambda url: url.host(core.QUrl.ComponentFormattingOption.FullyEncoded), + lambda url, host: url.setHost(host, core.QUrl.ParsingMode.StrictMode)), ('port', lambda url: str(url.port()) if url.port() > 0 else '', lambda url, x: url.setPort(int(x))), ('path', - lambda url: url.path(QUrl.ComponentFormattingOption.FullyEncoded), - lambda url, path: url.setPath(path, QUrl.ParsingMode.StrictMode)), + lambda url: url.path(core.QUrl.ComponentFormattingOption.FullyEncoded), + lambda url, path: url.setPath(path, core.QUrl.ParsingMode.StrictMode)), ('query', - lambda url: url.query(QUrl.ComponentFormattingOption.FullyEncoded), - lambda url, query: url.setQuery(query, QUrl.ParsingMode.StrictMode)), + lambda url: url.query(core.QUrl.ComponentFormattingOption.FullyEncoded), + lambda url, query: url.setQuery(query, core.QUrl.ParsingMode.StrictMode)), ('anchor', - lambda url: url.fragment(QUrl.ComponentFormattingOption.FullyEncoded), - lambda url, fragment: url.setFragment(fragment, QUrl.ParsingMode.StrictMode)), + lambda url: url.fragment(core.QUrl.ComponentFormattingOption.FullyEncoded), + lambda url, fragment: url.setFragment(fragment, core.QUrl.ParsingMode.StrictMode)), ] @@ -102,7 +102,7 @@ def incdec(url, count, inc_or_dec): segments = {'path', 'query'} # Make a copy of the QUrl so we don't modify the original - url = QUrl(url) + url = core.QUrl(url) # We're searching the last number so we walk the url segments backwards for segment, getter, setter in reversed(_URL_SEGMENTS): if segment not in segments: @@ -130,14 +130,14 @@ def path_up(url, count): count: The number of levels to go up in the url. """ urlutils.ensure_valid(url) - url = url.adjusted(QUrl.UrlFormattingOption.RemoveFragment | QUrl.UrlFormattingOption.RemoveQuery) - path = url.path(QUrl.ComponentFormattingOption.FullyEncoded) + url = url.adjusted(core.QUrl.UrlFormattingOption.RemoveFragment | core.QUrl.UrlFormattingOption.RemoveQuery) + path = url.path(core.QUrl.ComponentFormattingOption.FullyEncoded) if not path or path == '/': raise Error("Can't go up!") for _i in range(0, min(count, path.count('/'))): path = posixpath.join(path, posixpath.pardir) path = posixpath.normpath(path) - url.setPath(path, QUrl.ParsingMode.StrictMode) + url.setPath(path, core.QUrl.ParsingMode.StrictMode) return url @@ -146,7 +146,7 @@ def strip(url, count): if count != 1: raise Error("Count is not supported when stripping URL components") urlutils.ensure_valid(url) - return url.adjusted(QUrl.UrlFormattingOption.RemoveFragment | QUrl.UrlFormattingOption.RemoveQuery) + return url.adjusted(core.QUrl.UrlFormattingOption.RemoveFragment | core.QUrl.UrlFormattingOption.RemoveQuery) def _find_prevnext(prev, elems): |