diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 22c5fd333..41515d287 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -1244,7 +1244,7 @@ Added - New `:debug-log-filter` command to change console log filtering on-the-fly. - New `:debug-log-level` command to change the console loglevel on-the-fly. - New `general -> yank-ignored-url-parameters` option to configure which URL - parameters (like `utm_source` etc.) to strip off when yanking an URL. + parameters (like `utm_source` etc.) to strip off when yanking a URL. - Support for the https://developer.mozilla.org/en-US/docs/Web/API/Page_Visibility_API[HTML5 page visibility API] - New `readability` userscript which shows a readable version of a page (using @@ -1355,7 +1355,7 @@ Changed - `:hint` has a new `--add-history` argument to add the URL to the history for yank/spawn targets. - `:set` now cycles through values if more than one argument is given. -- `:open` now opens `default-page` without an URL even without `-t`/`-b`/`-w` given. +- `:open` now opens `default-page` without a URL even without `-t`/`-b`/`-w` given. Deprecated ~~~~~~~~~~ diff --git a/doc/faq.asciidoc b/doc/faq.asciidoc index a844bcfde..6687917c7 100644 --- a/doc/faq.asciidoc +++ b/doc/faq.asciidoc @@ -215,8 +215,8 @@ What's the difference between insert and passthrough mode?:: be useful to rebind escape to something else in passthrough mode only, to be able to send an escape keypress to the website. -Why does it take longer to open an URL in qutebrowser than in chromium?:: - When opening an URL in an existing instance, the normal qutebrowser +Why does it take longer to open a URL in qutebrowser than in chromium?:: + When opening a URL in an existing instance, the normal qutebrowser Python script is started and a few PyQt libraries need to be loaded until it is detected that there is an instance running to which the URL is then passed. This takes some time. diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 1cfcc8496..7d1b61131 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -303,10 +303,10 @@ def process_pos_args(args, via_ipc=False, cwd=None, target_arg=None): def open_url(url, target=None, no_raise=False, via_ipc=True): - """Open an URL in new window/tab. + """Open a URL in new window/tab. Args: - url: An URL to open. + url: A URL to open. target: same as new_instance_open_target (used as a default). no_raise: suppress target window raising. via_ipc: Whether the arguments were transmitted over IPC. diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index bb0b31626..b2be458ce 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -845,7 +845,7 @@ class AbstractTab(QWidget): @pyqtSlot(QUrl) def _on_predicted_navigation(self, url): - """Adjust the title if we are going to visit an URL soon.""" + """Adjust the title if we are going to visit a URL soon.""" qtutils.ensure_valid(url) url_string = url.toDisplayString() log.webview.debug("Predicted navigation: {}".format(url_string)) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index eba9174b1..0f1d368e9 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -1390,7 +1390,7 @@ class WebEngineTab(browsertab.AbstractTab): @pyqtSlot(QUrl) def _on_predicted_navigation(self, url): - """If we know we're going to visit an URL soon, change the settings. + """If we know we're going to visit a URL soon, change the settings. This is a WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656 """ diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index facfcc553..1f2e45741 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -357,7 +357,7 @@ class Config(QObject): """Get an object which can be mutated, e.g. in a config.py. If a pattern is given, return the value for that pattern. - Note that it's impossible to get a mutable object for an URL as we + Note that it's impossible to get a mutable object for a URL as we wouldn't know what pattern to apply. """ self.get_opt(name) # To make sure it exists diff --git a/qutebrowser/javascript/greasemonkey_wrapper.js b/qutebrowser/javascript/greasemonkey_wrapper.js index 457118696..f8c36151a 100644 --- a/qutebrowser/javascript/greasemonkey_wrapper.js +++ b/qutebrowser/javascript/greasemonkey_wrapper.js @@ -60,7 +60,7 @@ details.method = details.method ? details.method.toUpperCase() : "GET"; if (!details.url) { - throw new Error("GM_xmlhttpRequest requires an URL."); + throw new Error("GM_xmlhttpRequest requires a URL."); } // build XMLHttpRequest object diff --git a/scripts/dev/misc_checks.py b/scripts/dev/misc_checks.py index 299246448..27ff0105b 100644 --- a/scripts/dev/misc_checks.py +++ b/scripts/dev/misc_checks.py @@ -89,7 +89,8 @@ def check_spelling(): '[Ww]ether', '[Pp]rogramatically', '[Ss]plitted', '[Ee]xitted', '[Mm]ininum', '[Rr]esett?ed', '[Rr]ecieved', '[Rr]egularily', '[Uu]nderlaying', '[Ii]nexistant', '[Ee]lipsis', 'commiting', - 'existant', '[Rr]esetted', '[Ss]imilarily', '[Ii]nformations'} + 'existant', '[Rr]esetted', '[Ss]imilarily', '[Ii]nformations', + '[Aa]n [Uu][Rr][Ll]'} # Words which look better when splitted, but might need some fine tuning. words |= {'[Ww]ebelements', '[Mm]ouseevent', '[Kk]eysequence', diff --git a/tests/unit/browser/webkit/network/test_pac.py b/tests/unit/browser/webkit/network/test_pac.py index ff0346411..8c03c6cee 100644 --- a/tests/unit/browser/webkit/network/test_pac.py +++ b/tests/unit/browser/webkit/network/test_pac.py @@ -183,7 +183,7 @@ def test_fail_return(): ]) @pytest.mark.parametrize('from_file', [True, False]) def test_secret_url(url, has_secret, from_file): - """Make sure secret parts in an URL are stripped correctly. + """Make sure secret parts in a URL are stripped correctly. The following parts are considered secret: - If the PAC info is loaded from a local file, nothing. diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py index 672faf04a..946770bf1 100644 --- a/tests/unit/config/test_config.py +++ b/tests/unit/config/test_config.py @@ -473,7 +473,7 @@ class TestConfig: assert conf.get('colors.completion.category.fg') == QColor('white') def test_get_for_url(self, conf): - """Test conf.get() with an URL/pattern.""" + """Test conf.get() with a URL/pattern.""" pattern = urlmatch.UrlPattern('*://example.com/') name = 'content.javascript.enabled' conf.set_obj(name, False, pattern=pattern) @@ -484,7 +484,7 @@ class TestConfig: (False, configutils.UNSET) ]) def test_get_for_url_fallback(self, conf, fallback, expected): - """Test conf.get() with an URL and fallback.""" + """Test conf.get() with a URL and fallback.""" value = conf.get('content.javascript.enabled', url=QUrl('https://example.com/'), fallback=fallback) diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py index e569c51b8..1dd57a5e9 100644 --- a/tests/unit/utils/test_urlmatch.py +++ b/tests/unit/utils/test_urlmatch.py @@ -142,7 +142,7 @@ def test_parse_path(pattern, path): ("data:monkey", 'data', None, 'monkey'), # existing scheme ]) def test_lightweight_patterns(pattern, scheme, host, path): - """Make sure we can leave off parts of an URL. + """Make sure we can leave off parts of a URL. This is a deviation from Chromium to make patterns more user-friendly. """