[pypy-commit] pypy numpypy-axisops: fix the merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: numpypy-axisops
Changeset: r51301:a8dc471dcb8e
Date: 2012-01-13 23:43 +0200
http://bitbucket.org/pypy/pypy/changeset/a8dc471dcb8e/

Log:	fix the merge

diff --git a/pypy/module/micronumpy/interp_numarray.py b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -581,11 +581,11 @@
 
     def descr_var(self, space):
         # var = mean((values - mean(values)) ** 2)
-        w_res = self.descr_sub(space, self.descr_mean(space))
+        w_res = self.descr_sub(space, self.descr_mean(space, space.w_None))
         assert isinstance(w_res, BaseArray) 
         w_res = w_res.descr_pow(space, space.wrap(2))
         assert isinstance(w_res, BaseArray)
-        return w_res.descr_mean(space)
+        return w_res.descr_mean(space, space.w_None)
 
     def descr_std(self, space):
         # std(v) = sqrt(var(v))
diff --git a/pypy/module/micronumpy/interp_ufuncs.py b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -21,7 +21,7 @@
     greens=['shapelen', 'sig'],
     virtualizables=['frame'],
     reds=['self','arr', 'identity', 'frame'],
-#    name='axisreduce',
+    name='numpy_axisreduce',
     get_printable_location=new_printable_location('axisreduce'),
 )