← Back to branch summary

~ubuntu-branches/ubuntu/trusty/python-numpy/trusty-updates

« back to all changes in this revision

Viewing changes to numpy/core/src/umath/ufunc_type_resolution.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2013-01-28 19:03:02 UTC
  • mfrom: (7.1.13 experimental)
  • Revision ID: package-import@ubuntu.com-20130128190302-1kyak9j26902djjg
Tags: 1:1.7.0~rc1-1ubuntu1
Merge with Debian; remaining changes:

Show diffs side-by-side

added added

removed removed

Lines of Context:
numpy/core/src/umath/ufunc_type_resolution.c
77
77
                        PyUString_FromFormat(" with casting rule %s",
78
78
                                        npy_casting_to_string(casting)));
79
79
                PyErr_SetObject(PyExc_TypeError, errmsg);
 
80
                Py_DECREF(errmsg);
80
81
                return -1;
81
82
            }
82
83
        } else if (operands[i] != NULL) {
95
96
                        PyUString_FromFormat(" with casting rule %s",
96
97
                                        npy_casting_to_string(casting)));
97
98
                PyErr_SetObject(PyExc_TypeError, errmsg);
 
99
                Py_DECREF(errmsg);
98
100
                return -1;
99
101
            }
100
102
        }
725
727
        PyUString_ConcatAndDel(&errmsg,
726
728
                PyObject_Repr((PyObject *)PyArray_DESCR(operands[1])));
727
729
        PyErr_SetObject(PyExc_TypeError, errmsg);
 
730
        Py_DECREF(errmsg);
728
731
        return -1;
729
732
    }
730
733
}
895
898
        PyUString_ConcatAndDel(&errmsg,
896
899
                PyObject_Repr((PyObject *)PyArray_DESCR(operands[1])));
897
900
        PyErr_SetObject(PyExc_TypeError, errmsg);
 
901
        Py_DECREF(errmsg);
898
902
        return -1;
899
903
    }
900
904
}
1038
1042
        PyUString_ConcatAndDel(&errmsg,
1039
1043
                PyObject_Repr((PyObject *)PyArray_DESCR(operands[1])));
1040
1044
        PyErr_SetObject(PyExc_TypeError, errmsg);
 
1045
        Py_DECREF(errmsg);
1041
1046
        return -1;
1042
1047
    }
1043
1048
}
1157
1162
        PyUString_ConcatAndDel(&errmsg,
1158
1163
                PyObject_Repr((PyObject *)PyArray_DESCR(operands[1])));
1159
1164
        PyErr_SetObject(PyExc_TypeError, errmsg);
 
1165
        Py_DECREF(errmsg);
1160
1166
        return -1;
1161
1167
    }
1162
1168
}
1273
1279
        }
1274
1280
    }
1275
1281
    PyErr_SetObject(PyExc_TypeError, errmsg);
 
1282
    Py_DECREF(errmsg);
1276
1283
 
1277
1284
    return -1;
1278
1285
}