[pypy-commit] pypy default: fix test_streamio on win32

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r70837:7a7431b12694
Date: 2014-04-21 14:02 -0700
http://bitbucket.org/pypy/pypy/changeset/7a7431b12694/

Log:	fix test_streamio on win32

diff --git a/rpython/rlib/test/test_streamio.py b/rpython/rlib/test/test_streamio.py
--- a/rpython/rlib/test/test_streamio.py
+++ b/rpython/rlib/test/test_streamio.py
@@ -3,15 +3,15 @@
 import os
 import time
 import random
+
+import pytest
+
+from rpython.rlib import streamio
+from rpython.rtyper.test.tool import BaseRtypingTest
 from rpython.tool.udir import udir
 
-from rpython.rlib import streamio
-
-from rpython.rtyper.test.tool import BaseRtypingTest
-
 
 class TSource(streamio.Stream):
-
     def __init__(self, packets, tell=True, seek=True):
         for x in packets:
             assert x
@@ -1066,8 +1066,8 @@
     def test_read_interrupted(self):
         try:
             from signal import alarm, signal, SIG_DFL, SIGALRM
-        except:
-            skip('no alarm on this platform')
+        except ImportError:
+            pytest.skip('no alarm on this platform')
         try:
             read_fd, write_fd = os.pipe()
             file = streamio.DiskFile(read_fd)
@@ -1082,8 +1082,8 @@
     def test_write_interrupted(self):
         try:
             from signal import alarm, signal, SIG_DFL, SIGALRM
-        except:
-            skip('no alarm on this platform')
+        except ImportError:
+            pytest.skip('no alarm on this platform')
         try:
             read_fd, write_fd = os.pipe()
             file = streamio.DiskFile(write_fd)
@@ -1123,15 +1123,14 @@
 def speed_main():
     def diskopen(fn, mode):
         filemode = 0
-        import mmap
         if "r" in mode:
             filemode = os.O_RDONLY
         if "w" in mode:
             filemode |= os.O_WRONLY
-
         fd = os.open(fn, filemode)
         base = streamio.DiskFile(fd)
         return streamio.BufferingInputStream(base)
+
     def mmapopen(fn, mode):
         mmapmode = 0
         filemode = 0
@@ -1144,7 +1143,7 @@
             filemode |= os.O_WRONLY
         fd = os.open(fn, filemode)
         return streamio.MMapFile(fd, mmapmode)
+
     timeit(opener=diskopen)
     timeit(opener=mmapopen)
     timeit(opener=open)
-