Refactor unit tests and add DECREF

jayvius · jayvius · commit 6209e3ef3974 · 2012-12-21T14:31:08.000-06:00
- Refactor unit tests for invalid dtypes so that each test is on a separate line. This will make it easier to figure out which typestring is failing the unit test.
- Add Py_DECREF for temp variable
diff --git a/numpy/core/src/multiarray/conversion_utils.c b/numpy/core/src/multiarray/conversion_utils.c
@@ -1121,6 +1121,7 @@ PyArray_TypestrConvert(int itemsize, int gentype)
         if (temp != NULL) {
             if (temp->elsize != itemsize) {
                 if (DEPRECATE(msg) < 0) {
+                    Py_DECREF(temp);
                     return -1;
                 }
 
diff --git a/numpy/core/tests/test_dtype.py b/numpy/core/tests/test_dtype.py
@@ -47,15 +47,20 @@ def test_equivalent_dtype_hashing(self):
         self.assertTrue(hash(left) == hash(right))
 
     def test_invalid_types(self):
-        # Make sure invalid type strings raise exceptions.
+        # Make sure invalid type strings raise a warning.
         # For now, display a deprecation warning for invalid 
         # type sizes. In the future this should be changed 
         # to an exception.
 
-        for typestr in ['O3', 'O5', 'O7', 'b3', 'h4', 'I5',
-                        'e3', 'f5', 'g12']:
-            #print typestr
-            assert_warns(DeprecationWarning, np.dtype, typestr)
+        assert_warns(DeprecationWarning, np.dtype, 'O3')
+        assert_warns(DeprecationWarning, np.dtype, 'O5')
+        assert_warns(DeprecationWarning, np.dtype, 'O7')
+        assert_warns(DeprecationWarning, np.dtype, 'b3')
+        assert_warns(DeprecationWarning, np.dtype, 'h4')
+        assert_warns(DeprecationWarning, np.dtype, 'I5')
+        assert_warns(DeprecationWarning, np.dtype, 'e3')
+        assert_warns(DeprecationWarning, np.dtype, 'f5')
+        assert_warns(DeprecationWarning, np.dtype, 'g12')
 
         if np.dtype('l').itemsize == 8:
             assert_warns(DeprecationWarning, np.dtype, 'l4')
@@ -71,8 +76,6 @@ def test_invalid_types(self):
             assert_warns(DeprecationWarning, np.dtype, 'q8')
             assert_warns(DeprecationWarning, np.dtype, 'Q8')
 
-        assert_raises(TypeError, np.dtype, 't8', 'NA[u4,0xffffffff]')
-
     def test_bad_param(self):
         # Can't give a size that's too small
         assert_raises(ValueError, np.dtype,

Original file line number	Diff line number	Diff line change
`@@ -1121,6 +1121,7 @@ PyArray_TypestrConvert(int itemsize, int gentype)`
`1121`	`1121`	`if (temp != NULL) {`
`1122`	`1122`	`if (temp->elsize != itemsize) {`
`1123`	`1123`	`if (DEPRECATE(msg) < 0) {`
	`1124`	`+ Py_DECREF(temp);`
`1124`	`1125`	`return -1;`
`1125`	`1126`	`}`
`1126`	`1127`