[pypy-commit] pypy default: fix b82871fad050: the validate_fd is done by ll_os calls

bdkearns noreply at buildbot.pypy.org
Sat Feb 23 01:36:48 CET 2013


Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r61631:a9b2317162ca
Date: 2013-02-22 19:36 -0500
http://bitbucket.org/pypy/pypy/changeset/a9b2317162ca/

Log:	fix b82871fad050: the validate_fd is done by ll_os calls

diff --git a/pypy/module/_io/interp_fileio.py b/pypy/module/_io/interp_fileio.py
--- a/pypy/module/_io/interp_fileio.py
+++ b/pypy/module/_io/interp_fileio.py
@@ -3,7 +3,6 @@
 from pypy.interpreter.error import OperationError, wrap_oserror, wrap_oserror2
 from rpython.rlib.rarithmetic import r_longlong
 from rpython.rlib.rstring import StringBuilder
-from rpython.rlib.rposix import validate_fd
 from os import O_RDONLY, O_WRONLY, O_RDWR, O_CREAT, O_TRUNC
 import sys, os, stat, errno
 from pypy.module._io.interp_iobase import W_RawIOBase, convert_size
@@ -154,7 +153,6 @@
         fd_is_own = False
         try:
             if fd >= 0:
-                validate_fd(fd)
                 try:
                     os.fstat(fd)
                 except OSError, e:
@@ -235,7 +233,6 @@
         self.fd = -1
 
         try:
-            validate_fd(fd)
             os.close(fd)
         except OSError, e:
             raise wrap_oserror(space, e,


More information about the pypy-commit mailing list