From bc526cf0ce98c9b3848c387eb61d3c9c96f720b9 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 30 Jun 2017 19:54:30 +0200 Subject: [PATCH] Remove some FIXMEs --- qutebrowser/config/configdata.yml | 1 - qutebrowser/misc/crashdialog.py | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml index fa56cfad6..0a98a7b6e 100644 --- a/qutebrowser/config/configdata.yml +++ b/qutebrowser/config/configdata.yml @@ -963,7 +963,6 @@ prompt.radius: ## scrolling scrolling.bar: - # FIXME:conf meaning changed! type: Bool default: false desc: Show a scrollbar. diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py index 59f2f4a62..5b348ca0c 100644 --- a/qutebrowser/misc/crashdialog.py +++ b/qutebrowser/misc/crashdialog.py @@ -255,9 +255,8 @@ class _CrashDialog(QDialog): except Exception: self._crash_info.append(("Version info", traceback.format_exc())) try: - # FIXME:conf - conf = objreg.get('config') - self._crash_info.append(("Config", conf.dump_userconfig())) + self._crash_info.append(("Config", + config.instance.dump_userconfig())) except Exception: self._crash_info.append(("Config", traceback.format_exc())) try: @@ -636,9 +635,7 @@ def dump_exception_info(exc, pages, cmdhist, qobjects): traceback.print_exc() print("\n---- Config ----", file=sys.stderr) try: - # FIXME:conf - conf = objreg.get('config') - print(conf.dump_userconfig(), file=sys.stderr) + print(config.instance.dump_userconfig(), file=sys.stderr) except Exception: traceback.print_exc() print("\n---- Commandline args ----", file=sys.stderr)