Add fix to unit test; remove debug logging

jayvius · jayvius · commit 5de0b6e72807 · 2012-12-21T14:31:08.000-06:00
Add check to see if 12 bytes is a valid size for a long double
diff --git a/numpy/core/src/multiarray/conversion_utils.c b/numpy/core/src/multiarray/conversion_utils.c
@@ -1116,19 +1116,9 @@ PyArray_TypestrConvert(int itemsize, int gentype)
      * This should eventually be changed to an error in
      * future NumPy versions.
      */
-    
-    if (newtype == NPY_NOTYPE)
-    {
-        printf("XXX: gentype=%c\n", gentype);
-    }
     if (newtype == NPY_NOTYPE) {
         temp = PyArray_DescrFromType(gentype);
-
-        if (gentype == 'g')
-            printf("XXX: temp=%x\n", temp);
         if (temp != NULL) {
-            if (gentype == 'g')
-                printf("XXX: elsize=%d itemsize=%d\n", temp->elsize, itemsize);
             if (temp->elsize != itemsize) {
                 if (DEPRECATE(msg) < 0) {
                     Py_DECREF(temp);
diff --git a/numpy/core/tests/test_dtype.py b/numpy/core/tests/test_dtype.py
@@ -60,7 +60,11 @@ def test_invalid_types(self):
         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('g').itemsize == 8 or np.dtype('g').itemsize == 16:
+            assert_warns(DeprecationWarning, np.dtype, 'g12')
+        elif np.dtype('g').itemsize == 12:
+            assert_warns(DeprecationWarning, np.dtype, 'g16')
 
         if np.dtype('l').itemsize == 8:
             assert_warns(DeprecationWarning, np.dtype, 'l4')
