ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-19 15:53:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

encodingutil: argv and output encodings are always the same on all platforms. Lose the unnecessary generality of them being different. fixes #1120

Browse Source
This commit is contained in:
david-sarah
2011-06-29 11:53:56 -07:00
parent da58fefd50
commit f9d218c673
4 changed files with 63 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/scripts/runner.py
View File

@ -6,7 +6,7 @@ from twisted.python import usage
from allmydata.scripts.common import BaseOptions
from allmydata.scripts import debug, create_node, startstop_node, cli, keygen, stats_gatherer
from allmydata.util.encodingutil import quote_output, get_argv_encoding
from allmydata.util.encodingutil import quote_output, get_io_encoding
def GROUP(s):
# Usage.parseOptions compares argv[1] against command[0], so it will
@ -73,7 +73,7 @@ def runner(argv,
c = c.subOptions
print >>stdout, str(c)
try:
msg = e.args[0].decode(get_argv_encoding())
msg = e.args[0].decode(get_io_encoding())
except Exception:
msg = repr(e)
print >>stdout, "%s: %s\n" % (sys.argv[0], quote_output(msg, quotemarks=False))