diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-08-26 09:02:00 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-08-27 07:27:02 -0600 |
| commit | 5c7b9bb8fec7d2abbb13ad56be23afc49296df2f (patch) | |
| tree | 7b2674438f0fe954c698fd8875bdbb69cfef4c71 /numpy | |
| parent | 159bfbcf97ed89f08d4fcfc8f64c5ad51657df2a (diff) | |
| download | numpy-5c7b9bb8fec7d2abbb13ad56be23afc49296df2f.tar.gz | |
BLD: core: onefile build fix and Python3 compatibility change
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/_methods.py | 6 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/multiarraymodule_onefile.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/numpy/core/_methods.py b/numpy/core/_methods.py index 747f4268c..80e12298c 100644 --- a/numpy/core/_methods.py +++ b/numpy/core/_methods.py @@ -1,9 +1,9 @@ # Array methods which are called by the both the C-code for the method # and the Python code for the NumPy-namespace function -import multiarray as mu -import umath as um -from numeric import asanyarray +from numpy.core import multiarray as mu +from numpy.core import umath as um +from numpy.core.numeric import asanyarray def _amax(a, axis=None, out=None, skipna=False, keepdims=False): return um.maximum.reduce(a, axis=axis, diff --git a/numpy/core/src/multiarray/multiarraymodule_onefile.c b/numpy/core/src/multiarray/multiarraymodule_onefile.c index c07c004b3..15d281d2e 100644 --- a/numpy/core/src/multiarray/multiarraymodule_onefile.c +++ b/numpy/core/src/multiarray/multiarraymodule_onefile.c @@ -51,6 +51,7 @@ #include "reduction.c" #include "na_mask.c" #include "na_object.c" +#include "boolean_ops.c" #ifndef Py_UNICODE_WIDE #include "ucsnarrow.c" |