diff --git a/src/parselmouth/Thing.cpp b/src/parselmouth/Thing.cpp index f5954e18..b4b0ec5e 100644 --- a/src/parselmouth/Thing.cpp +++ b/src/parselmouth/Thing.cpp @@ -31,16 +31,8 @@ namespace parselmouth { CLASS_BINDING(Thing, structThing, detail::PraatHolder) BINDING_CONSTRUCTOR(Thing, "Thing") BINDING_INIT(Thing) { -#if PY_MAJOR_VERSION >= 3 def("__str__", [](Thing self) { MelderInfoInterceptor info; Thing_info(self); return info.get(); }); -#else - def("__unicode__", - [](Thing self) { MelderInfoInterceptor info; Thing_info(self); return info.get(); }); - - def("__str__", - [](Thing self) { MelderInfoInterceptor info; Thing_info(self); return info.get(); }); -#endif def_property("name", &Thing_getName, [](Thing self, char32 *name) { if (name) praat_cleanUpName(name); Thing_setName(self, name); }); diff --git a/src/parselmouth/Vector.cpp b/src/parselmouth/Vector.cpp index 3d44df7c..6badb3d6 100644 --- a/src/parselmouth/Vector.cpp +++ b/src/parselmouth/Vector.cpp @@ -131,21 +131,9 @@ namespace parselmouth [](Vector self, double factor) { auto result = Data_copy(self); Vector_multiplyByScalar(result.get(), 1 / factor); return result; }, "factor"_a, py::is_operator()); -#if PY_MAJOR_VERSION < 3 - def( - "__idiv__", - [](Vector self, double factor) { Vector_multiplyByScalar(self, 1 / factor); return self; }, - "factor"_a, py::is_operator()); - - def( - "__div__", - [](Vector self, double factor) { auto result = Data_copy(self); Vector_multiplyByScalar(result.get(), 1 / factor); return result; }, - "factor"_a, py::is_operator()); -#endif - - def("scale", - args_cast<_, Positive<_>>(Vector_scale), - "scale"_a); + def("scale", + args_cast<_, Positive<_>>(Vector_scale), + "scale"_a); def("scale_peak", args_cast<_, Positive<_>>(Vector_scale), diff --git a/src/parselmouth/praat.cpp b/src/parselmouth/praat.cpp index 44594303..0644058d 100644 --- a/src/parselmouth/praat.cpp +++ b/src/parselmouth/praat.cpp @@ -203,7 +203,7 @@ void PraatEnvironment::toPraatArg(structStackel &stackel, const py::handle &arg) return fillStackel(stackel, py::cast(arg)); else if (py::isinstance(arg)) return fillStackel(stackel, py::cast(arg)); - else if (py::isinstance(arg) && (PY_MAJOR_VERSION < 3 || !py::isinstance(arg))) + else if (py::isinstance(arg) && !py::isinstance(arg)) return fillStackel(stackel, py::cast(arg)); try {