[pypy-commit] pypy use-file-star-for-file: remove usage of StreamErrors

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: use-file-star-for-file
Changeset: r73139:2b155355a77a
Date: 2014-08-28 23:03 -0400
http://bitbucket.org/pypy/pypy/changeset/2b155355a77a/

Log:	remove usage of StreamErrors

diff --git a/pypy/module/_file/__init__.py b/pypy/module/_file/__init__.py
--- a/pypy/module/_file/__init__.py
+++ b/pypy/module/_file/__init__.py
@@ -13,7 +13,7 @@
 
     def shutdown(self, space):
         # at shutdown, flush all open streams.  Ignore I/O errors.
-        from pypy.module._file.interp_file import getopenstreams, StreamErrors
+        from pypy.module._file.interp_file import getopenstreams
         openstreams = getopenstreams(space)
         while openstreams:
             for stream in openstreams.keys():
@@ -24,7 +24,7 @@
                 else:
                     try:
                         stream.flush()
-                    except StreamErrors:
+                    except OSError:
                         pass
 
     def setup_after_space_initialization(self):
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
@@ -6,7 +6,7 @@
 from rpython.rlib.objectmodel import specialize
 from rpython.rlib.rarithmetic import r_longlong
 from rpython.rlib.rstring import StringBuilder
-from pypy.module._file.interp_stream import W_AbstractStream, StreamErrors
+from pypy.module._file.interp_stream import W_AbstractStream
 from pypy.module.posix.interp_posix import dispatch_filename
 from pypy.interpreter.error import OperationError, oefmt, wrap_oserror
 from pypy.interpreter.typedef import (TypeDef, GetSetProperty,
@@ -53,9 +53,8 @@
         assert isinstance(self, W_File)
         try:
             self.direct_close()
-        except StreamErrors, e:
-            operr = wrap_streamerror(self.space, e, self.w_name)
-            raise operr
+        except OSError as e:
+            raise wrap_oserror_as_ioerror(self.space, e, self.w_name)
 
     def fdopenstream(self, stream, fd, mode, w_name=None):
         self.fd = fd