Merge pull request numpy#8103 from mattip/pypy-fixes

Pypy fixes
joestubbs · Oct 8, 2016 · dbb7094 · dbb7094
2 parents b0159a9 + 2f9f10a
commit dbb7094
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 61 deletions.
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
@@ -2837,6 +2837,15 @@ static PyObject *
 }
 /**end repeat**/
 
+/**begin repeat
+ *  #name = half, float, double, longdouble,
+ *          cfloat, cdouble, clongdouble#
+ *  #NAME = Half, Float, Double, LongDouble,
+ *          CFloat, CDouble, CLongDouble#
+ */
+static PyNumberMethods @name@_arrtype_as_number;
+/**end repeat**/
+
 static PyObject *
 bool_index(PyObject *a)
 {
@@ -4094,6 +4103,18 @@ initialize_numeric_types(void)
     Py@NAME@ArrType_Type.tp_as_number->nb_index = (unaryfunc)@name@_index;
 
     /**end repeat**/
+
+    /**begin repeat
+     *  #name = half, float, double, longdouble,
+     *          cfloat, cdouble, clongdouble#
+     *  #NAME = Half, Float, Double, LongDouble,
+     *          CFloat, CDouble, CLongDouble#
+     */
+    @name@_arrtype_as_number = gentype_as_number;
+    Py@NAME@ArrType_Type.tp_as_number = &@name@_arrtype_as_number;
+
+    /**end repeat**/
+
     PyBoolArrType_Type.tp_as_number->nb_index = (unaryfunc)bool_index;
 
     PyStringArrType_Type.tp_alloc = NULL;

diff --git a/numpy/core/src/multiarray/shape.c b/numpy/core/src/multiarray/shape.c
@@ -93,9 +93,9 @@ PyArray_Resize(PyArrayObject *self, PyArray_Dims *newshape, int refcheck,
                     "Use the resize function or refcheck=False");
 
             return NULL;
-#else            
+#else
             refcnt = PyArray_REFCOUNT(self);
-#endif            
+#endif /* PYPY_VERSION */
         }
         else {
             refcnt = 1;