8000 fix for python2.7 · numpy/numpy@b785515 · GitHub
[go: up one dir, main page]
Skip to content

Commit b785515

Browse files
mattipmattip
committed
fix for python2.7
1 parent 67e752e commit b785515

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎numpy/core/src/multiarray/scalartypes.c.src

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,14 @@ gentype_@name@(PyObject *m1, PyObject *m2)
239239
/**end repeat**/
240240
#endif
241241

242+
#if PY_VERSION_HEX >= 0x03050000
242243
static PyObject *
243244
gentype21_not_implemented(PyObject *m1, PyObject *m2)
244245
{
245246
Py_INCREF(Py_NotImplemented);
246247
return Py_NotImplemented;
247248
}
249+
#endif
248250

249251
/* Get a nested slot, or NULL if absent */
250252
#define GET_NESTED_SLOT(type, group, slot) \
@@ -1114,8 +1116,7 @@ static PyNumberMethods gentype_as_number = {
11141116
(binaryfunc)gentype_add, /*nb_add*/
11151117
(binaryfunc)gentype_subtract, /*nb_subtract*/
11161118
(binaryfunc)gentype_multiply, /*nb_multiply*/
1117-
#if defined(NPY_PY3K)
1118-
#else
1119+
#if !defined(NPY_PY3K)
11191120
(binaryfunc)gentype_divide, /*nb_divide*/
11201121
#endif
11211122
(binaryfunc)gentype_remainder, /*nb_remainder*/
@@ -1131,8 +1132,7 @@ static PyNumberMethods gentype_as_number = {
11311132
(binaryfunc)gentype_and, /*nb_and*/
11321133
(binaryfunc)gentype_xor, /*nb_xor*/
11331134
(binaryfunc)gentype_or, /*nb_or*/
1134-
#if defined(NPY_PY3K)
1135-
#else
1135+
#if !defined(NPY_PY3K)
11361136
0, /*nb_coerce*/
11371137
#endif
11381138
(unaryfunc)gentype_int, /*nb_int*/
@@ -1142,16 +1142,14 @@ static PyNumberMethods gentype_as_number = {
11421142
(unaryfunc)gentype_long, /*nb_long*/
11431143
#endif
11441144
(unaryfunc)gentype_float, /*nb_float*/
1145-
#if defined(NPY_PY3K)
1146-
#else
1145+
#if !defined(NPY_PY3K)
11471146
(unaryfunc)gentype_oct, /*nb_oct*/
11481147
(unaryfunc)gentype_hex, /*nb_hex*/
11491148
#endif
11501149
0, /*inplace_add*/
11511150
0, /*inplace_subtract*/
11521151
0, /*inplace_multiply*/
1153-
#if defined(NPY_PY3K)
1154-
#else
1152+
#if !defined(NPY_PY3K)
11551153
0, /*inplace_divide*/
11561154
#endif
11571155
0, /*inplace_remainder*/

‎numpy/core/src/umath/scalarmath.c.src

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,12 +1178,14 @@ static PyObject *
11781178

11791179
#endif
11801180

1181+
#if PY_VERSION_HEX >= 0x03050000
11811182
static PyObject *
11821183
@name@_matrix_multiply(PyObject *a, PyObject *b)
11831184
{
11841185
Py_INCREF(Py_NotImplemented);
11851186
return Py_NotImplemented;
11861187
}
1188+
#endif
11871189

11881190
/**end repeat**/
11891191
#undef _IS_ZERO

0 commit comments

Comments
 (0)
0