[pypy-svn] r74301 - pypy/branch/py12/pypy/rpython/numpy/test

[hpk at codespeak.net]

Author: hpk
Date: Fri Apr 30 21:39:20 2010
New Revision: 74301

Removed:
   pypy/branch/py12/pypy/rpython/numpy/test/conftest.py
Modified:
   pypy/branch/py12/pypy/rpython/numpy/test/test_array.py
Log:
simplify import skipping here


Modified: pypy/branch/py12/pypy/rpython/numpy/test/test_array.py
==============================================================================
--- pypy/branch/py12/pypy/rpython/numpy/test/test_array.py	(original)
+++ pypy/branch/py12/pypy/rpython/numpy/test/test_array.py	Fri Apr 30 21:39:20 2010
@@ -3,6 +3,7 @@
 """
 
 import py
+numpy = py.test.importorskip("numpy")
 import pypy.rpython.numpy.implementation
 from pypy.annotation import model as annmodel
 from pypy.annotation.model import SomeObject, SomeInteger, SomeChar, SomeTuple
@@ -15,13 +16,6 @@
 from pypy.rpython.lltypesystem import rffi
 from pypy.rpython.rint import IntegerRepr
 
-def setup_module(mod):
-    try:
-        import numpy
-    except ImportError:
-        py.test.skip("numpy not found")
-    mod.numpy = numpy
-
 from pypy.rpython.numpy.rarray import ArrayRepr
 from pypy.rpython.numpy.aarray import SomeArray