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 6217c8d00..148f0f6e9 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 PyQt5.QtCore import QUrl +from qutebrowser.qt.core import QUrl 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.FullyEncoded), - lambda url, host: url.setHost(host, QUrl.StrictMode)), + lambda url: url.host(QUrl.ComponentFormattingOption.FullyEncoded), + lambda url, host: url.setHost(host, 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.FullyEncoded), - lambda url, path: url.setPath(path, QUrl.StrictMode)), + lambda url: url.path(QUrl.ComponentFormattingOption.FullyEncoded), + lambda url, path: url.setPath(path, QUrl.ParsingMode.StrictMode)), ('query', - lambda url: url.query(QUrl.FullyEncoded), - lambda url, query: url.setQuery(query, QUrl.StrictMode)), + lambda url: url.query(QUrl.ComponentFormattingOption.FullyEncoded), + lambda url, query: url.setQuery(query, QUrl.ParsingMode.StrictMode)), ('anchor', - lambda url: url.fragment(QUrl.FullyEncoded), - lambda url, fragment: url.setFragment(fragment, QUrl.StrictMode)), + lambda url: url.fragment(QUrl.ComponentFormattingOption.FullyEncoded), + lambda url, fragment: url.setFragment(fragment, QUrl.ParsingMode.StrictMode)), ] @@ -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.RemoveFragment | QUrl.RemoveQuery) - path = url.path(QUrl.FullyEncoded) + url = url.adjusted(QUrl.UrlFormattingOption.RemoveFragment | QUrl.UrlFormattingOption.RemoveQuery) + path = url.path(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.StrictMode) + url.setPath(path, 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.RemoveFragment | QUrl.RemoveQuery) + return url.adjusted(QUrl.UrlFormattingOption.RemoveFragment | QUrl.UrlFormattingOption.RemoveQuery) def _find_prevnext(prev, elems): @@ -219,10 +219,10 @@ def prevnext(*, browsertab, win_id, baseurl, prev=False, if window: new_window = mainwindow.MainWindow( private=cur_tabbed_browser.is_private) - new_window.show() tabbed_browser = objreg.get('tabbed-browser', scope='window', window=new_window.win_id) tabbed_browser.tabopen(url, background=False) + new_window.show() elif tab: cur_tabbed_browser.tabopen(url, background=background) else: |