diff --git a/qutebrowser/utils/config.py b/qutebrowser/utils/config.py index 3619d4da8..bd54c3e4b 100644 --- a/qutebrowser/utils/config.py +++ b/qutebrowser/utils/config.py @@ -8,6 +8,7 @@ MONOSPACE -- A list of suitable monospace fonts. import os.path import os +import io import logging from configparser import ConfigParser @@ -186,3 +187,11 @@ class Config(ConfigParser): logging.debug("Saving config to {}".format(self.configfile)) with open(self.configfile, 'w') as f: self.write(f) + + def dump_userconfig(self): + """Returns the part of the config which was changed by the user as a + string. + """ + with io.StringIO() as f: + self.write(f) + return f.getvalue() diff --git a/qutebrowser/widgets/__init__.py b/qutebrowser/widgets/__init__.py index eaf456872..c247bc71a 100644 --- a/qutebrowser/widgets/__init__.py +++ b/qutebrowser/widgets/__init__.py @@ -22,9 +22,8 @@ class CrashDialog(QDialog): lbl.setText( 'Argh! qutebrowser crashed unexpectedly.
' 'Please review the info below to remove sensitive data and then ' - 'submit it to ' - '' - 'qutebrowser@the-compiler.org.

' + 'submit it to ' + 'crash@qutebrowser.org.

' 'You can click "Restore tabs" to attempt to reopen your ' 'open tabs.' ) @@ -39,7 +38,10 @@ class CrashDialog(QDialog): ''.join(traceback.format_exception(*exc))) + '==== Open pages ====\n{}\n\n'.format('\n'.join(pages)) + '==== Command history ====\n{}\n\n'.format('\n'.join(cmdhist)) + - '==== Commandline args ====\n{}'.format(' '.join(sys.argv[1:])) + '==== Commandline args ====\n{}\n\n'.format( + ' '.join(sys.argv[1:])) + + '==== Config ====\n{}'.format( + utils.config.config.dump_userconfig()) ) vbox.addWidget(txt) self.setLayout(vbox)