diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 3ab4bdec9..0ad1f3dae 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -58,7 +58,7 @@ class Application(QApplication): mainwindow: The MainWindow QWidget. config: The main ConfigManager cmd_history: The "cmd_history" LineConfigParser instance. - args: ArgumentParser instance. + _args: ArgumentParser instance. _commandrunner: The main CommandRunner instance. _debugconsole: The ConsoleWidget for debugging. _keyparsers: A mapping from modes to keyparsers. @@ -101,7 +101,8 @@ class Application(QApplication): sys.excepthook = self._exception_hook - self.args = args + self._args = args + self.registry['args'] = args log.init.debug("Starting init...") self._init_misc() utils.actute_warning() @@ -162,12 +163,12 @@ class Application(QApplication): def _init_config(self): """Inizialize and read the config.""" - if self.args.confdir is None: + if self._args.confdir is None: confdir = utils.get_standard_dir(QStandardPaths.ConfigLocation) - elif self.args.confdir == '': + elif self._args.confdir == '': confdir = None else: - confdir = self.args.confdir + confdir = self._args.confdir try: self.config = config.ConfigManager(confdir, 'qutebrowser.conf', self) @@ -251,7 +252,7 @@ class Application(QApplication): def _init_misc(self): """Initialize misc things.""" - if self.args.version: + if self._args.version: print(version.version()) print() print() @@ -329,7 +330,7 @@ class Application(QApplication): self.processEvents(QEventLoop.ExcludeUserInputEvents | QEventLoop.ExcludeSocketNotifiers) tabbedbrowser = self.registry['tabbedbrowser'] - for cmd in self.args.command: + for cmd in self._args.command: if cmd.startswith(':'): log.init.debug("Startup cmd {}".format(cmd)) self._commandrunner.run_safely_init(cmd.lstrip(':')) @@ -813,7 +814,7 @@ class Application(QApplication): def exit(self, status): """Extend QApplication::exit to log the event.""" log.destroy.debug("Now calling QApplication::exit.") - if self.args.debug_exit: + if self._args.debug_exit: print("Now logging late shutdown.", file=sys.stderr) debug.trace_lines(True) super().exit(status) diff --git a/qutebrowser/models/completion.py b/qutebrowser/models/completion.py index e09622554..3b2c66dc1 100644 --- a/qutebrowser/models/completion.py +++ b/qutebrowser/models/completion.py @@ -19,11 +19,11 @@ """CompletionModels for different usages.""" -from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication +from PyQt5.QtCore import pyqtSlot, Qt from qutebrowser.config import config, configdata from qutebrowser.models import basecompletion -from qutebrowser.utils import log, qtutils +from qutebrowser.utils import log, qtutils, utils from qutebrowser.commands import cmdutils @@ -155,8 +155,7 @@ class CommandCompletionModel(basecompletion.BaseCompletionModel): assert cmdutils.cmd_dict cmdlist = [] for obj in set(cmdutils.cmd_dict.values()): - if obj.hide or (obj.debug and not - QCoreApplication.instance().args.debug): + if obj.hide or (obj.debug and not utils.get_object('args').debug): pass else: cmdlist.append((obj.name, obj.desc)) @@ -183,8 +182,7 @@ class HelpCompletionModel(basecompletion.BaseCompletionModel): assert cmdutils.cmd_dict cmdlist = [] for obj in set(cmdutils.cmd_dict.values()): - if obj.hide or (obj.debug and not - QCoreApplication.instance().args.debug): + if obj.hide or (obj.debug and not utils.get_object('args').debug): pass else: cmdlist.append((':' + obj.name, obj.desc))