rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'lahwaacz-pretty-url'

Browse Source
This commit is contained in:
Florian Bruhin 2016-09-26 07:08:52 +02:00
commit aec887bc46
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/browser/commands.py
View File

@ -677,7 +677,9 @@ class CommandDispatcher:
"""Helper method for yank() to get the URL to copy.""" """Helper method for yank() to get the URL to copy."""
assert what in ['url', 'pretty-url'], what assert what in ['url', 'pretty-url'], what
flags = QUrl.RemovePassword flags = QUrl.RemovePassword
if what != 'pretty-url': if what == 'pretty-url':
flags |= QUrl.DecodeReserved
else:
flags |= QUrl.FullyEncoded flags |= QUrl.FullyEncoded
url = QUrl(self._current_url()) url = QUrl(self._current_url())
url_query = QUrlQuery(url) url_query = QUrlQuery(url)

2
qutebrowser/commands/runners.py
View File

@ -54,7 +54,7 @@ def replace_variables(win_id, arglist):
'url': lambda: _current_url(tabbed_browser).toString( 'url': lambda: _current_url(tabbed_browser).toString(
QUrl.FullyEncoded | QUrl.RemovePassword), QUrl.FullyEncoded | QUrl.RemovePassword),
'url:pretty': lambda: _current_url(tabbed_browser).toString( 'url:pretty': lambda: _current_url(tabbed_browser).toString(
QUrl.RemovePassword), QUrl.DecodeReserved | QUrl.RemovePassword),
'clipboard': utils.get_clipboard, 'clipboard': utils.get_clipboard,
'primary': lambda: utils.get_clipboard(selection=True), 'primary': lambda: utils.get_clipboard(selection=True),
} }