[pypy-commit] pypy use-file-star-for-file: fix handling of unicode filename

bdkearns noreply at buildbot.pypy.org
Fri Aug 29 07:41:33 CEST 2014


Author: Brian Kearns <bdkearns at gmail.com>
Branch: use-file-star-for-file
Changeset: r73154:a01f06512ec4
Date: 2014-08-29 01:40 -0400
http://bitbucket.org/pypy/pypy/changeset/a01f06512ec4/

Log:	fix handling of unicode filename

diff --git a/pypy/module/_file/interp_file.py b/pypy/module/_file/interp_file.py
--- a/pypy/module/_file/interp_file.py
+++ b/pypy/module/_file/interp_file.py
@@ -7,7 +7,7 @@
 from rpython.rlib.rarithmetic import r_longlong
 from rpython.rlib.rstring import StringBuilder
 from pypy.module._file.interp_stream import W_AbstractStream
-from pypy.module.posix.interp_posix import dispatch_filename
+from pypy.module.posix.interp_posix import fsencode_w
 from pypy.interpreter.error import OperationError, oefmt, wrap_oserror
 from pypy.interpreter.typedef import (TypeDef, GetSetProperty,
     interp_attrproperty, make_weakref_descr, interp_attrproperty_w)
@@ -99,7 +99,7 @@
         self.direct_close()
         self.check_mode_ok(mode)
         self.w_name = w_name
-        stream = rfile.create_file(self.space.str_w(w_name), mode, buffering)
+        stream = rfile.create_file(fsencode_w(self.space, w_name), mode, buffering)
         self.fdopenstream(stream, mode)
 
     def direct___enter__(self):


More information about the pypy-commit mailing list