Author: Antonio Cuni <[email protected]>
Branch: py3k
Changeset: r52962:31042aa82067
Date: 2012-02-28 11:11 +0100
http://bitbucket.org/pypy/pypy/changeset/31042aa82067/
Log: add a way to open a _io file given the stream. The dependency on
_file is almost killed now
diff --git a/pypy/module/imp/interp_imp.py b/pypy/module/imp/interp_imp.py
--- a/pypy/module/imp/interp_imp.py
+++ b/pypy/module/imp/interp_imp.py
@@ -4,6 +4,7 @@
from pypy.interpreter.gateway import unwrap_spec
from pypy.rlib import streamio
from pypy.module._io.interp_iobase import W_IOBase
+from pypy.module._io import interp_io
from pypy.module._file.interp_stream import wrap_streamerror
@@ -63,11 +64,12 @@
stream = find_info.stream
if stream is not None:
- fileobj = W_File(space)
- fileobj.fdopenstream(
- stream, stream.try_to_find_file_descriptor(),
- find_info.filemode, w_filename)
- w_fileobj = space.wrap(fileobj)
+ fd = stream.try_to_find_file_descriptor()
+ # in python2, both CPython and PyPy pass the filename to
+ # open(). However, CPython 3 just passes the fd, so the returned file
+ # object doesn't have a name attached. We do the same in PyPy, because
+ # there is no easy way to attach the filename -- too bad
+ w_fileobj = interp_io.open(space, space.wrap(fd), find_info.filemode)
else:
w_fileobj = space.w_None
w_import_info = space.newtuple(
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
