Merge pull request #6386 from charris/backport-PyObject_Cmp-fix

charris · charris · commit 9871ed44accf · 2015-09-28T19:59:32.000-06:00
BUG: Fix PyObject_Cmp in npy_3kcompat.h.
diff --git a/numpy/core/include/numpy/npy_3kcompat.h b/numpy/core/include/numpy/npy_3kcompat.h
@@ -325,7 +325,7 @@ PyObject_Cmp(PyObject *i1, PyObject *i2, int *cmp)
 {
     int v;
     v = PyObject_RichCompareBool(i1, i2, Py_LT);
-    if (v == 0) {
+    if (v == 1) {
         *cmp = -1;
         return 1;
     }
@@ -334,7 +334,7 @@ PyObject_Cmp(PyObject *i1, PyObject *i2, int *cmp)
     }
 
     v = PyObject_RichCompareBool(i1, i2, Py_GT);
-    if (v == 0) {
+    if (v == 1) {
         *cmp = 1;
         return 1;
     }
@@ -343,7 +343,7 @@ PyObject_Cmp(PyObject *i1, PyObject *i2, int *cmp)
     }
 
     v = PyObject_RichCompareBool(i1, i2, Py_EQ);
-    if (v == 0) {
+    if (v == 1) {
         *cmp = 0;
         return 1;
     }
diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py
@@ -935,6 +935,13 @@ def test_sign(self):
             assert_equal(res, tgt)
             assert_equal(out, tgt)
 
+    def test_sign_dtype_object(self):
+        # In reference to github issue #6229
+        foo = np.array([-.1, 0, .1])
+        a = np.sign(foo.astype(np.object))
+        b = np.sign(foo)
+        assert_array_equal(a, b)
+
 
 class TestMinMax(TestCase):
     def test_minmax_blocked(self):

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ PyObject_Cmp(PyObject i1, PyObject i2, int *cmp)`
`325`	`325`	`{`
`326`	`326`	`int v;`
`327`	`327`	`v = PyObject_RichCompareBool(i1, i2, Py_LT);`
`328`		`- if (v == 0) {`
	`328`	`+ if (v == 1) {`
`329`	`329`	`*cmp = -1;`
`330`	`330`	`return 1;`
`331`	`331`	`}`
`@@ -334,7 +334,7 @@ PyObject_Cmp(PyObject i1, PyObject i2, int *cmp)`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`v = PyObject_RichCompareBool(i1, i2, Py_GT);`
`337`		`- if (v == 0) {`
	`337`	`+ if (v == 1) {`
`338`	`338`	`*cmp = 1;`
`339`	`339`	`return 1;`
`340`	`340`	`}`
`@@ -343,7 +343,7 @@ PyObject_Cmp(PyObject i1, PyObject i2, int *cmp)`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`v = PyObject_RichCompareBool(i1, i2, Py_EQ);`
`346`		`- if (v == 0) {`
	`346`	`+ if (v == 1) {`
`347`	`347`	`*cmp = 0;`
`348`	`348`	`return 1;`
`349`	`349`	`}`