[pypy-commit] pypy default: fix translation: backout 1043bb8b12f8 for now

pjenvey noreply at buildbot.pypy.org
Sat Aug 24 02:14:29 CEST 2013


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: 
Changeset: r66309:96d6dfac5ab9
Date: 2013-08-23 17:13 -0700
http://bitbucket.org/pypy/pypy/changeset/96d6dfac5ab9/

Log:	fix translation: backout 1043bb8b12f8 for now

diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -577,12 +577,13 @@
                 except OperationError, e:
                     # fall back to the original byte string
                     result_w[i] = w_bytes
-            return space.newlist(result_w)
         else:
             dirname = space.str0_w(w_dirname)
-            return space.newlist_str(rposix.listdir(dirname))
+            result = rposix.listdir(dirname)
+            result_w = [space.wrap(s) for s in result]
     except OSError, e:
         raise wrap_oserror2(space, e, w_dirname)
+    return space.newlist(result_w)
 
 def pipe(space):
     "Create a pipe.  Returns (read_end, write_end)."


More information about the pypy-commit mailing list