From 016fc0ebb1c324b47d50acca8b6e832d8c2a02ee Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 15 Dec 2017 16:05:20 +0100 Subject: [PATCH] Fix some inconsistent returns --- qutebrowser/browser/downloads.py | 2 ++ qutebrowser/browser/qtnetworkdownloads.py | 5 ++--- qutebrowser/browser/webkit/network/filescheme.py | 1 + qutebrowser/browser/webkit/rfc6266.py | 1 + qutebrowser/commands/command.py | 1 + qutebrowser/config/config.py | 5 ++++- qutebrowser/config/configfiles.py | 2 +- qutebrowser/keyinput/modeparsers.py | 2 +- qutebrowser/mainwindow/prompt.py | 3 ++- qutebrowser/misc/sessions.py | 2 +- 10 files changed, 16 insertions(+), 8 deletions(-) diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py index 354e74c9b..99869dae9 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -103,6 +103,8 @@ def immediate_download_path(prompt_download_directory=None): if not prompt_download_directory: return download_dir() + return None + def _path_suggestion(filename): """Get the suggested file path. diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py index 0e079b633..378bc72b5 100644 --- a/qutebrowser/browser/qtnetworkdownloads.py +++ b/qutebrowser/browser/qtnetworkdownloads.py @@ -303,8 +303,7 @@ class DownloadItem(downloads.AbstractDownloadItem): """Handle QNetworkReply errors.""" if code == QNetworkReply.OperationCanceledError: return - else: - self._die(self._reply.errorString()) + self._die(self._reply.errorString()) @pyqtSlot() def _on_read_timer_timeout(self): @@ -399,7 +398,7 @@ class DownloadManager(downloads.AbstractDownloadManager): """ if not url.isValid(): urlutils.invalid_url_error(url, "start download") - return + return None req = QNetworkRequest(url) if user_agent is not None: req.setHeader(QNetworkRequest.UserAgentHeader, user_agent) diff --git a/qutebrowser/browser/webkit/network/filescheme.py b/qutebrowser/browser/webkit/network/filescheme.py index a8cade1db..a971e3257 100644 --- a/qutebrowser/browser/webkit/network/filescheme.py +++ b/qutebrowser/browser/webkit/network/filescheme.py @@ -132,5 +132,6 @@ class FileSchemeHandler(schemehandler.SchemeHandler): data = dirbrowser_html(path) return networkreply.FixedDataNetworkReply( request, data, 'text/html', self.parent()) + return None except UnicodeEncodeError: return None diff --git a/qutebrowser/browser/webkit/rfc6266.py b/qutebrowser/browser/webkit/rfc6266.py index 1f71b23e5..f83413ee2 100644 --- a/qutebrowser/browser/webkit/rfc6266.py +++ b/qutebrowser/browser/webkit/rfc6266.py @@ -270,6 +270,7 @@ class _ContentDisposition: elif 'filename' in self.assocs: # XXX Reject non-ascii (parsed via qdtext) here? return self.assocs['filename'] + return None def is_inline(self): """Return if the file should be handled inline. diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py index afb6253db..b4ff1cde8 100644 --- a/qutebrowser/commands/command.py +++ b/qutebrowser/commands/command.py @@ -190,6 +190,7 @@ class Command: return True elif arg_info.win_id: return True + return False def _inspect_func(self): """Inspect the function to get useful informations from it. diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index 43fb7e839..c170d0705 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -107,12 +107,14 @@ class change_filter: # noqa: N801,N806 pylint: disable=invalid-name """Call the underlying function.""" if self._check_match(option): return func() + return None else: @functools.wraps(func) def wrapper(wrapper_self, option=None): """Call the underlying function.""" if self._check_match(option): return func(wrapper_self) + return None return wrapper @@ -463,7 +465,8 @@ class ConfigContainer: def __setattr__(self, attr, value): """Set the given option in the config.""" if attr.startswith('_'): - return super().__setattr__(attr, value) + super().__setattr__(attr, value) + return name = self._join(attr) with self._handle_error('setting', name): diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py index 27c898611..0e9572f55 100644 --- a/qutebrowser/config/configfiles.py +++ b/qutebrowser/config/configfiles.py @@ -136,7 +136,7 @@ class YamlConfig(QObject): with open(self._filename, 'r', encoding='utf-8') as f: yaml_data = utils.yaml_load(f) except FileNotFoundError: - return {} + return except OSError as e: desc = configexc.ConfigErrorDesc("While reading", e) raise configexc.ConfigFileErrors('autoconfig.yml', [desc]) diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py index 1d74e5659..85b149470 100644 --- a/qutebrowser/keyinput/modeparsers.py +++ b/qutebrowser/keyinput/modeparsers.py @@ -218,7 +218,7 @@ class HintKeyParser(keyparser.CommandKeyParser): self._last_press = LastPress.none return True elif match == self.Match.other: - pass + return None elif match == self.Match.none: # We couldn't find a keychain so we check if it's a special key. return self._handle_special_key(e) diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py index bd72d47ea..3d21a52e0 100644 --- a/qutebrowser/mainwindow/prompt.py +++ b/qutebrowser/mainwindow/prompt.py @@ -171,7 +171,7 @@ class PromptQueue(QObject): # just queue it up for later. log.prompt.debug("Adding {} to queue.".format(question)) self._queue.append(question) - return + return None if blocking: # If we're blocking we save the old question on the stack, so we @@ -207,6 +207,7 @@ class PromptQueue(QObject): return question.answer else: question.completed.connect(self._pop_later) + return None @pyqtSlot(usertypes.KeyMode) def _on_mode_left(self, mode): diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py index fcd82cda1..b46b5a26a 100644 --- a/qutebrowser/misc/sessions.py +++ b/qutebrowser/misc/sessions.py @@ -291,7 +291,7 @@ class SessionManager(QObject): data = self._last_window_session if data is None: log.sessions.error("last_window_session is None while saving!") - return + return None else: data = self._save_all(only_window=only_window, with_private=with_private)