[pypy-svn] r75453 - pypy/trunk/py/_process

[fijal at codespeak.net]

Author: fijal
Date: Fri Jun 18 20:32:28 2010
New Revision: 75453

Modified:
   pypy/trunk/py/_process/cmdexec.py
Log:
Grumble. sys.stdout.encoding can be None


Modified: pypy/trunk/py/_process/cmdexec.py
==============================================================================
--- pypy/trunk/py/_process/cmdexec.py	(original)
+++ pypy/trunk/py/_process/cmdexec.py	Fri Jun 18 20:32:28 2010
@@ -18,8 +18,10 @@
             universal_newlines=True,
             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, err = process.communicate()
-    out = py.builtin._totext(out, sys.stdout.encoding)
-    err = py.builtin._totext(err, sys.stderr.encoding)
+    out = py.builtin._totext(out, sys.stdout.encoding or
+                             sys.getdefaultencoding())
+    err = py.builtin._totext(err, sys.stderr.encoding or
+                             sys.getdefaultencoding())
     status = process.poll()
     if status:
         raise ExecutionFailed(status, status, cmd, out, err)