kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions 3 Packages Projects 9 Releases 2 Wiki Activity

Base: [skip ci] use PyNumber_Check instead of PyFloat_Check/PyLong_Check to check for numbers

Browse Source
This commit is contained in:
wmayer
2021-09-30 14:22:56 +02:00
parent 231a3b1d4d
commit 5ae444a49c
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Base/VectorPyImp.cpp
View File

@@ -150,15 +150,10 @@ PyObject* VectorPy::number_multiply_handler(PyObject *self, PyObject *other)
Py::Float mult(a * b);
return Py::new_reference_to(mult);
}
else if (PyFloat_Check(other)) {
else if (PyNumber_Check(other)) {
double b = PyFloat_AsDouble(other);
return new VectorPy(a * b);
}
else if (PyLong_Check(other)) {
long b = PyLong_AsLong(other);
return new VectorPy(a * (double)b);
}
else {
PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
return 0;
@@ -166,14 +161,10 @@ PyObject* VectorPy::number_multiply_handler(PyObject *self, PyObject *other)
}
else if (PyObject_TypeCheck(other, &(VectorPy::Type))) {
Base::Vector3d a = static_cast<VectorPy*>(other) ->value();
if (PyFloat_Check(self)) {
if (PyNumber_Check(self)) {
double b = PyFloat_AsDouble(self);
return new VectorPy(a * b);
}
else if (PyLong_Check(self)) {
long b = PyLong_AsLong(self);
return new VectorPy(a * (double)b);
}
else {
PyErr_SetString(PyExc_TypeError, "A Vector can only be multiplied by Vector or number");
return 0;
@@ -216,7 +207,7 @@ int VectorPy::sequence_ass_item(PyObject *self, Py_ssize_t index, PyObject *valu
return -1;
}
if (PyFloat_Check(value)) {
if (PyNumber_Check(value)) {
VectorPy::PointerType ptr = static_cast<VectorPy*>(self)->getVectorPtr();
(*ptr)[index] = PyFloat_AsDouble(value);
}