Author: mattip <[email protected]>
Branch: missing-ndarray-attributes
Changeset: r60317:6d2a659cc6dd
Date: 2012-12-31 10:22 +0200
http://bitbucket.org/pypy/pypy/changeset/6d2a659cc6dd/
Log: function naming clash
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
@@ -700,7 +700,8 @@
return getattr(interp_ufuncs.get(space), ufunc_name).reduce(
space, self, True, promote_to_largest, w_axis,
False, out, w_dtype, cumultative=cumultative)
- return func_with_new_name(impl, "reduce_%s_impl" % ufunc_name)
+ return func_with_new_name(impl, "reduce_%s_impl_%d_%d" % (ufunc_name,
+ promote_to_largest, cumultative))
descr_sum = _reduce_ufunc_impl("add")
descr_sum_promote = _reduce_ufunc_impl("add", True)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
