[pypy-commit] pypy numpy-dtype-refactor: comment these out, they're in the wrong place in the MRO with the mixins

alex_gaynor noreply at buildbot.pypy.org
Fri Nov 11 21:37:57 CET 2011


Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: numpy-dtype-refactor
Changeset: r49346:892cab276a98
Date: 2011-11-11 15:37 -0500
http://bitbucket.org/pypy/pypy/changeset/892cab276a98/

Log:	comment these out, they're in the wrong place in the MRO with the
	mixins

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
@@ -266,7 +266,6 @@
 
 
 def ufunc_dtype_caller(space, ufunc_name, op_name, argcount, comparison_func):
-    assert hasattr(types.BaseType, op_name)
     if argcount == 1:
         def impl(res_dtype, value):
             return getattr(res_dtype.itemtype, op_name)(value)
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -21,10 +21,10 @@
 class BaseType(object):
     def _unimplemented_ufunc(self, *args):
         raise NotImplementedError
-    add = sub = mul = div = mod = pow = eq = ne = lt = le = gt = ge = max = \
-        min = copysign = pos = neg = abs = sign = reciprocal = fabs = floor = \
-        exp = sin = cos = tan = arcsin = arccos = arctan = arcsinh = \
-        arctanh = _unimplemented_ufunc
+    # add = sub = mul = div = mod = pow = eq = ne = lt = le = gt = ge = max = \
+    #     min = copysign = pos = neg = abs = sign = reciprocal = fabs = floor = \
+    #     exp = sin = cos = tan = arcsin = arccos = arctan = arcsinh = \
+    #     arctanh = _unimplemented_ufunc
 
 class Primitive(object):
     _mixin_ = True


More information about the pypy-commit mailing list