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

Base: remove Py2 code

Browse Source
This commit is contained in:
luz paz
2021-04-23 12:48:46 -04:00
committed by wwmayer
parent 31b0f25b6d
commit 142c2c2c4d
16 changed files with 0 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/Base/QuantityPyImp.cpp
View File

@@ -265,26 +265,9 @@ PyObject * QuantityPy::number_int_handler (PyObject *self)
}
QuantityPy* q = static_cast<QuantityPy*>(self);
#if PY_MAJOR_VERSION < 3
return PyInt_FromLong((long)q->getValue());
#else
return PyLong_FromLong((long)q->getValue());
#endif
}
#if PY_MAJOR_VERSION < 3
PyObject * QuantityPy::number_long_handler (PyObject *self)
{
if (!PyObject_TypeCheck(self, &(QuantityPy::Type))) {
PyErr_SetString(PyExc_TypeError, "Arg must be Quantity");
return 0;
}
QuantityPy* q = static_cast<QuantityPy*>(self);
return PyInt_FromLong((long)q->getValue());
}
#endif
PyObject * QuantityPy::number_negative_handler (PyObject *self)
{
if (!PyObject_TypeCheck(self, &(QuantityPy::Type))) {
@@ -324,10 +307,6 @@ static Quantity &pyToQuantity(Quantity &q, PyObject *pyobj) {
q = *static_cast<Base::QuantityPy*>(pyobj)->getQuantityPtr();
else if (PyFloat_Check(pyobj))
q = Quantity(PyFloat_AsDouble(pyobj));
#if PY_MAJOR_VERSION < 3
else if (PyInt_Check(pyobj))
q = Quantity(PyInt_AsLong(pyobj));
#endif
else if (PyLong_Check(pyobj))
q = Quantity(PyLong_AsLong(pyobj));
else {
@@ -427,11 +406,6 @@ PyObject * QuantityPy::number_remainder_handler (PyObject *self, PyObject *other
else if (PyFloat_Check(other)) {
d2 = PyFloat_AsDouble(other);
}
#if PY_MAJOR_VERSION < 3
else if (PyInt_Check(other)) {
d2 = (double)PyInt_AsLong(other);
}
#endif
else if (PyLong_Check(other)) {
d2 = (double)PyLong_AsLong(other);
}
@@ -479,13 +453,6 @@ PyObject * QuantityPy::number_power_handler (PyObject *self, PyObject *other, Py
double b = PyFloat_AsDouble(other);
return new QuantityPy(new Quantity(a->pow(b)) );
}
#if PY_MAJOR_VERSION < 3
else if (PyInt_Check(other)) {
Base::Quantity *a = static_cast<QuantityPy*>(self) ->getQuantityPtr();
double b = (double)PyInt_AsLong(other);
return new QuantityPy(new Quantity(a->pow(b)));
}
#endif
else if (PyLong_Check(other)) {
Base::Quantity *a = static_cast<QuantityPy*>(self) ->getQuantityPtr();
double b = (double)PyLong_AsLong(other);
@@ -641,11 +608,7 @@ void QuantityPy::setFormat(Py::Dict arg)
if (arg.hasKey("NumberFormat")) {
Py::Char form(arg.getItem("NumberFormat"));
#if PY_MAJOR_VERSION >= 3
std::string fmtstr = static_cast<std::string>(Py::String(form));
#else
std::string fmtstr = static_cast<std::string>(form);
#endif
if (fmtstr.size() != 1)
throw Py::ValueError("Invalid format character");
@@ -740,21 +703,3 @@ PyObject * QuantityPy::number_or_handler (PyObject* /*self*/, PyObject* /*other*
return 0;
}
#if PY_MAJOR_VERSION < 3
int QuantityPy::number_coerce_handler (PyObject** /*self*/, PyObject** /*other*/)
{
return 1;
}
PyObject * QuantityPy::number_oct_handler (PyObject* /*self*/)
{
PyErr_SetString(PyExc_TypeError, "oct() argument can't be converted to oct");
return 0;
}
PyObject * QuantityPy::number_hex_handler (PyObject* /*self*/)
{
PyErr_SetString(PyExc_TypeError, "hex() argument can't be converted to hex");
return 0;
}
#endif