diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py index af8b89d79..705fa37bf 100644 --- a/src/allmydata/scripts/runner.py +++ b/src/allmydata/scripts/runner.py @@ -16,7 +16,7 @@ from twisted.internet import defer, task, threads from allmydata.scripts.common import get_default_nodedir from allmydata.scripts import debug, create_node, cli, \ admin, tahoe_run, tahoe_invite -from allmydata.util.encodingutil import quote_output, quote_local_unicode_path, get_io_encoding +from allmydata.util.encodingutil import quote_local_unicode_path from allmydata.util.eliotutil import ( opt_eliot_destination, opt_help_eliot_destinations, @@ -121,11 +121,7 @@ def parse_or_exit_with_explanation(argv, stdout=sys.stdout): while hasattr(c, 'subOptions'): c = c.subOptions print(str(c), file=stdout) - try: - msg = e.args[0].decode(get_io_encoding()) - except Exception: - msg = repr(e) - print("%s: %s\n" % (sys.argv[0], quote_output(msg, quotemarks=False)), file=stdout) + print("%s: %s\n" % (sys.argv[0], e), file=stdout) sys.exit(1) return config