Author: Alex Gaynor <alex.gay...@gmail.com>
Branch:
Changeset: r67535:84ab919963ab
Date: 2013-10-23 09:20 -0700
http://bitbucket.org/pypy/pypy/changeset/84ab919963ab/
Log: merged upstream
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)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
