diff options
| author |   Maciej Fijalkowski <fijall@gmail.com> | 2010-06-16 06:24:46 +0000 |
|---|---|---|
| committer | Maciej Fijalkowski <fijall@gmail.com> | 2010-06-16 06:24:46 +0000 |
| commit | 03fa7041a042a5b2e2ea922149ddf12f022d4d9f (patch) | |
| tree | a14668c6ce93411b6171ba98de42df0423b16828 /py | |
| parent | Finish writing a tool that'll package pypy-c's out of nightly builds (diff) | |
| download | pypy-03fa7041a042a5b2e2ea922149ddf12f022d4d9f.tar.gz pypy-03fa7041a042a5b2e2ea922149ddf12f022d4d9f.tar.bz2 pypy-03fa7041a042a5b2e2ea922149ddf12f022d4d9f.zip | |
This seems to fix some of 64bit issues. A bit "what the hell", but makes
some sort of sense.
Diffstat (limited to 'py')
| -rw-r--r-- | py/_process/cmdexec.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/_process/cmdexec.py b/py/_process/cmdexec.py index 5720593e0a..0f38822d57 100644 --- a/py/_process/cmdexec.py +++ b/py/_process/cmdexec.py @@ -18,8 +18,8 @@ def cmdexec(cmd): universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = process.communicate() - out = py.builtin._totext(out, sys.getdefaultencoding()) - err = py.builtin._totext(err, sys.getdefaultencoding()) + out = py.builtin._totext(out, sys.stdout.encoding) + err = py.builtin._totext(err, sys.stderr.encoding) status = process.poll() if status: raise ExecutionFailed(status, status, cmd, out, err) |