Request 179 (accepted)

python-pycmox.changes Changed

python-pycmox.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package python-pycmox
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 
 Name:           python-pycmox
-Version:        0.1.0
+Version:        0.2.0
 Release:        0
 Summary:        Python wrapper for RS485 exchange
 License:        LGPL-3.0-or-later
@@ -27,14 +27,11 @@
 URL:            https://curl.sai.msu.ru/hg/pycmox
 Source:         pycmox-%{version}.tar.xz
 BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pybind11-devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{pythons}
 BuildRequires:  gcc
-%if %{with python2}
-BuildRequires:  libboost_python-devel
-%endif
 BuildRequires:  gcc-c++
-BuildRequires:  libboost_python3-devel
 BuildRequires:  python-rpm-macros
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %python_subpackages

_service Changed

pycmox-0.2.0.tar.xz/.hgtags Added

pycmox-0.1.0.tar.xz/MANIFEST.in -> pycmox-0.2.0.tar.xz/MANIFEST.in Changed

pycmox-0.1.0.tar.xz/README.rst -> pycmox-0.2.0.tar.xz/README.rst Changed

pycmox-0.2.0.tar.xz/requirements.txt Added

pycmox-0.1.0.tar.xz/setup.py -> pycmox-0.2.0.tar.xz/setup.py Changed

pycmox-0.1.0.tar.xz/src/pycmox.cpp -> pycmox-0.2.0.tar.xz/src/pycmox.cpp Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Matwey V. Kornilov <matwey.kornilov@gmail.com>
+ * Copyright (c) 2021-2023, Matwey V. Kornilov <matwey.kornilov@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
  *
@@ -7,21 +7,15 @@
 
 #include <string>
 #include <memory>
+#include <vector>
 
-#include <boost/python.hpp>
+#include <pybind11/pybind11.h>
 
 #include <exchange.h>
 
 
-void translator(const BaseRS485::ErrFatal& err) {
-	PyErr_SetString(PyExc_RuntimeError, err.what());
-}
-void translator(const BaseRS485::ErrDriver& err) {
-	PyErr_SetString(PyExc_RuntimeError, err.what());
-}
-void translator(const BaseRS485::ErrSignal& err) {
-	PyErr_SetString(PyExc_RuntimeError, err.what());
-}
+namespace py = pybind11;
+
 
 class rs485 {
 public:
@@ -43,18 +37,18 @@
 	int askLong(unsigned int addr, int c) {
 		return impl_->askLong(addr, ALong(c));
 	}
-	boost::python::object askData(unsigned int addr, int c) {
-		auto vec = impl_->askData(addr, AData(c));
+	py::bytes askData(unsigned int addr, int c) {
+		const auto vec = impl_->askData(addr, AData(c));
 
-		const auto handle = boost::python::handle<>(PyBytes_FromStringAndSize(reinterpret_cast<char*>(vec.data()), vec.size()));
-		return boost::python::object(handle);
+		return py::bytes(reinterpret_cast<const char*>(vec.data()), vec.size());
 	}
-	boost::python::object askRaw(const boost::python::object& data) {
-		const boost::python::stl_input_iterator<unsigned char> begin(data), end;
-		auto vec = impl_->askRaw(std::vector<unsigned char>(begin, end));
+	py::bytes askRaw(const py::buffer& data) {
+		const auto info = data.request();
+		const auto begin = reinterpret_cast<const unsigned char*>(info.ptr);
+		const auto end = begin + static_cast<std::size_t>(info.size);
+		const auto vec = impl_->askRaw(std::vector<unsigned char>(begin, end));
 
-		const auto handle = boost::python::handle<>(PyBytes_FromStringAndSize(reinterpret_cast<char*>(vec.data()), vec.size()));
-		return boost::python::object(handle);
+		return py::bytes(reinterpret_cast<const char*>(vec.data()), vec.size());
 	}
 
 	int sendSimpleCommand(unsigned int addr, int c) {
@@ -66,8 +60,10 @@
 	int sendWordCommand(unsigned int addr, int c, int w) {
 		return impl_->sendWordCommand(addr, SWord(c), w);
 	}
-	int sendData(unsigned int addr, const boost::python::object& data) {
-		const boost::python::stl_input_iterator<unsigned char> begin(data), end;
+	int sendData(unsigned int addr, const py::buffer& data) {
+		const auto info = data.request();
+		const auto begin = reinterpret_cast<const unsigned char*>(info.ptr);
+		const auto end = begin + static_cast<std::size_t>(info.size);
 		const std::vector<unsigned char> vec(begin, end);
 
 		return impl_->sendData(addr, vec.size(), vec);
@@ -383,28 +379,24 @@
 constexpr const char* rs485::sendData_docstring;
 
 
-BOOST_PYTHON_MODULE(pycmox)
+PYBIND11_MODULE(pycmox, m)
 {
-	using namespace boost::python;
-
-	register_exception_translator<BaseRS485::ErrFatal,
-		void (*)(const BaseRS485::ErrFatal&)>(translator);
-	register_exception_translator<BaseRS485::ErrDriver,
-		void (*)(const BaseRS485::ErrDriver&)>(translator);
-	register_exception_translator<BaseRS485::ErrSignal,
-		void (*)(const BaseRS485::ErrSignal&)>(translator);
+	py::register_exception<BaseRS485::ErrFatal>(m, "ErrFatal", PyExc_RuntimeError);
+	py::register_exception<BaseRS485::ErrDriver>(m, "ErrDriver", PyExc_RuntimeError);
+	py::register_exception<BaseRS485::ErrSignal>(m, "ErrSignal", PyExc_RuntimeError);
 
 	{
-	scope in_RS485 = class_<rs485, boost::noncopyable>("RS485", rs485::docstring, init<std::string, int>(rs485::init_docstring, args("self", "filename", "baudrate")))
-		.def("askByte", &rs485::askByte, rs485::askByte_docstring, args("self", "address", "command"))
-		.def("askWord", &rs485::askWord, rs485::askWord_docstring, args("self", "address", "command"))
-		.def("askLong", &rs485::askLong, rs485::askLong_docstring, args("self", "address", "command"))
-		.def("askData", &rs485::askData, rs485::askData_docstring, args("self", "address", "command"))
-		.def("askRaw",  &rs485::askRaw,  rs485::askRaw_docstring,  args("self", "bytes"))
-		.def("sendSimpleCommand", &rs485::sendSimpleCommand, rs485::sendSimpleCommand_docstring, args("self", "address", "command"))
-		.def("sendByteCommand",   &rs485::sendByteCommand,   rs485::sendByteCommand_docstring,   args("self", "address", "command", "argument"))
-		.def("sendWordCommand",   &rs485::sendWordCommand,   rs485::sendWordCommand_docstring,   args("self", "address", "command", "argument"))
-		.def("sendData", &rs485::sendData, rs485::sendData_docstring, args("self", "address", "bytes"))
+	auto in_RS485 = py::class_<rs485>(m, "RS485", rs485::docstring)
+		.def(py::init<std::string, int>(), rs485::init_docstring, py::arg("filename"), py::arg("baudrate"))
+		.def("askByte", &rs485::askByte, rs485::askByte_docstring, py::arg("address"), py::arg("command"))
+		.def("askWord", &rs485::askWord, rs485::askWord_docstring, py::arg("address"), py::arg("command"))
+		.def("askLong", &rs485::askLong, rs485::askLong_docstring, py::arg("address"), py::arg("command"))
+		.def("askData", &rs485::askData, rs485::askData_docstring, py::arg("address"), py::arg("command"))
+		.def("askRaw",  &rs485::askRaw,  rs485::askRaw_docstring,  py::arg("bytes"))
+		.def("sendSimpleCommand", &rs485::sendSimpleCommand, rs485::sendSimpleCommand_docstring, py::arg("address"), py::arg("command"))
+		.def("sendByteCommand",   &rs485::sendByteCommand,   rs485::sendByteCommand_docstring,   py::arg("address"), py::arg("command"), py::arg("argument"))
+		.def("sendWordCommand",   &rs485::sendWordCommand,   rs485::sendWordCommand_docstring,   py::arg("address"), py::arg("command"), py::arg("argument"))
+		.def("sendData", &rs485::sendData, rs485::sendData_docstring, py::arg("address"), py::arg("bytes"))
 		;
 
 	in_RS485.attr("DONE") = static_cast<int>(BaseRS485::DONE);

Overview

Request 179 (accepted)

Request History