Author: Brian Kearns <[email protected]>
Branch:
Changeset: r61640:5e8977235753
Date: 2013-02-23 01:19 -0500
http://bitbucket.org/pypy/pypy/changeset/5e8977235753/
Log: move _numpypy.average to numpypy.lib.function_base
diff --git a/lib_pypy/numpypy/__init__.py b/lib_pypy/numpypy/__init__.py
--- a/lib_pypy/numpypy/__init__.py
+++ b/lib_pypy/numpypy/__init__.py
@@ -1,5 +1,6 @@
from _numpypy import *
from .core import *
+from .lib import *
import _numpypy
__all__ = _numpypy.__all__
diff --git a/lib_pypy/numpypy/lib/__init__.py b/lib_pypy/numpypy/lib/__init__.py
new file mode 100644
--- /dev/null
+++ b/lib_pypy/numpypy/lib/__init__.py
@@ -0,0 +1,1 @@
+from .function_base import *
diff --git a/lib_pypy/numpypy/lib/function_base.py
b/lib_pypy/numpypy/lib/function_base.py
new file mode 100644
--- /dev/null
+++ b/lib_pypy/numpypy/lib/function_base.py
@@ -0,0 +1,8 @@
+from _numpypy import array
+
+def average(a):
+ # This implements a weighted average, for now we don't implement the
+ # weighting, just the average part!
+ if not hasattr(a, "mean"):
+ a = array(a)
+ return a.mean()
diff --git a/pypy/module/micronumpy/__init__.py
b/pypy/module/micronumpy/__init__.py
--- a/pypy/module/micronumpy/__init__.py
+++ b/pypy/module/micronumpy/__init__.py
@@ -163,7 +163,6 @@
interpleveldefs[exposed] = "interp_ufuncs.get(space).%s" % impl
appleveldefs = {
- 'average': 'app_numpy.average',
'eye': 'app_numpy.eye',
'arange': 'app_numpy.arange',
}
diff --git a/pypy/module/micronumpy/app_numpy.py
b/pypy/module/micronumpy/app_numpy.py
--- a/pypy/module/micronumpy/app_numpy.py
+++ b/pypy/module/micronumpy/app_numpy.py
@@ -2,13 +2,6 @@
import _numpypy
-def average(a):
- # This implements a weighted average, for now we don't implement the
- # weighting, just the average part!
- if not hasattr(a, "mean"):
- a = _numpypy.array(a)
- return a.mean()
-
def eye(n, m=None, k=0, dtype=None):
if m is None:
m = n
diff --git a/pypy/module/micronumpy/test/test_module.py
b/pypy/module/micronumpy/test/test_module.py
deleted file mode 100644
--- a/pypy/module/micronumpy/test/test_module.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
-
-
-class AppTestNumPyModule(BaseNumpyAppTest):
- def test_average(self):
- from _numpypy import array, average
- assert average(range(10)) == 4.5
- assert average(array(range(10))) == 4.5
diff --git a/pypy/module/test_lib_pypy/numpypy/lib/test_function_base.py
b/pypy/module/test_lib_pypy/numpypy/lib/test_function_base.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/test_lib_pypy/numpypy/lib/test_function_base.py
@@ -0,0 +1,7 @@
+from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
+
+class AppTestFunctionBase(BaseNumpyAppTest):
+ def test_average(self):
+ from numpypy import array, average
+ assert average(range(10)) == 4.5
+ assert average(array(range(10))) == 4.5
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
