[pypy-commit] pypy default: Fix attempt for a3ce5fe94074.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r55304:865681d756a9
Date: 2012-06-04 15:16 +0200
http://bitbucket.org/pypy/pypy/changeset/865681d756a9/

Log:	Fix attempt for a3ce5fe94074.

diff --git a/pypy/rlib/streamio.py b/pypy/rlib/streamio.py
--- a/pypy/rlib/streamio.py
+++ b/pypy/rlib/streamio.py
@@ -500,7 +500,7 @@
         if self.buf:
             try:
                 self.do_seek(self.tell(), 0)
-            except MyNotImplementedError:
+            except (MyNotImplementedError, OSError):
                 pass
             else:
                 self.buf = ""
@@ -713,7 +713,7 @@
         if self.buf is not None:
             try:
                 self.do_seek(self.bufstart-len(self.buf), 1)
-            except MyNotImplementedError:
+            except (MyNotImplementedError, OSError):
                 pass
             else:
                 self.buf = None
@@ -968,7 +968,10 @@
 
     def flush_buffers(self):
         if self.lfbuffer:
-            self.base.seek(-len(self.lfbuffer), 1)
+            try:
+                self.base.seek(-len(self.lfbuffer), 1)
+            except (MyNotImplementedError, OSError):
+                return
             self.lfbuffer = ""
         self.do_flush()
 
@@ -1102,7 +1105,7 @@
         if self.buf:
             try:
                 self.base.seek(-len(self.buf), 1)
-            except MyNotImplementedError:
+            except (MyNotImplementedError, OSError):
                 pass
             else:
                 self.buf = ""