[pypy-commit] pypy default: fix numpypy test_get_include

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r67533:ffeac57b6a3e
Date: 2013-10-23 12:15 -0400
http://bitbucket.org/pypy/pypy/changeset/ffeac57b6a3e/

Log:	fix numpypy test_get_include

diff --git a/lib_pypy/numpypy/lib/utils.py b/lib_pypy/numpypy/lib/utils.py
--- a/lib_pypy/numpypy/lib/utils.py
+++ b/lib_pypy/numpypy/lib/utils.py
@@ -21,14 +21,4 @@
         ...
 
     """
-    try:
-        import numpy
-    except:
-        # running from pypy source directory
-        head, tail = os.path.split(os.path.dirname(os.path.abspath(__file__)))
-        return os.path.join(head, '../include')
-    else:
-        # using installed numpy core headers
-        import numpy.core as core
-        d = os.path.join(os.path.dirname(core.__file__), 'include')
-    return d
+    return os.path.join(os.path.dirname(__file__), '../../../include')
diff --git a/pypy/module/micronumpy/interp_dtype.py b/pypy/module/micronumpy/interp_dtype.py
--- a/pypy/module/micronumpy/interp_dtype.py
+++ b/pypy/module/micronumpy/interp_dtype.py
@@ -84,6 +84,7 @@
 
     def build_and_convert(self, space, box):
         return self.itemtype.build_and_convert(space, self, box)
+
     def coerce(self, space, w_item):
         return self.itemtype.coerce(space, self, w_item)