Skip to content

[WIP] [#211,#212,#???] Virtual environment support for Python 3.8+ and some housekeeping #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: 4-3-stable
Choose a base branch
from
Draft

[WIP] [#211,#212,#???] Virtual environment support for Python 3.8+ and some housekeeping #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd9076d
[???] Use std:: when calling strcmp
SwooshyCueb Aug 20, 2024
b0c72e9
[???] Replace usage of boost::format with fmt
SwooshyCueb Aug 12, 2024
5fe1ced
[???] Use std:: when referencing size_t
SwooshyCueb Aug 20, 2024
a648780
[WIP] [211] Initialize module search paths via PyConfig for 3.8+
SwooshyCueb Aug 20, 2024
faca353
[225] Use PyGILState_* API for thread handling
SwooshyCueb Aug 21, 2024
b66ade0
[WIP] [225] Remove python_mutex
SwooshyCueb Aug 21, 2024
eb6fe2d
[WIP] [225] Implement early/temporary GIL releasing/unlocking
SwooshyCueb Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions include/irods/private/re/python.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#ifndef IRODS_RE_PYTHON_HPP
#define IRODS_RE_PYTHON_HPP

#include <cstring>
#include <type_traits>
#include <functional>

#include <boost/any.hpp>
#include <boost/optional.hpp>
#include <boost/format.hpp>
#include <boost/core/demangle.hpp>

#include <irods/irods_re_serialization.hpp>
Expand All @@ -30,6 +30,8 @@
#include <boost/python.hpp>
#pragma GCC diagnostic pop

#include <fmt/format.h>

#include "irods/private/re/python/irods_types.hpp"
#include "irods/private/re/python/irods_errors.hpp"
#include "irods/private/re/python/types/array_ref.hpp"
Expand Down Expand Up @@ -109,36 +111,36 @@ namespace
else if (!msParam.type) {
THROW(SYS_NOT_SUPPORTED, "msParam type is null");
}
else if (strcmp(msParam.type, GenQueryInp_MS_T) == 0) {
else if (std::strcmp(msParam.type, GenQueryInp_MS_T) == 0) {
return boost::python::object{*static_cast<genQueryInp_t*>(msParam.inOutStruct)};
}
else if (strcmp(msParam.type, GenQueryOut_MS_T) == 0) {
else if (std::strcmp(msParam.type, GenQueryOut_MS_T) == 0) {
return boost::python::object{*static_cast<genQueryOut_t*>(msParam.inOutStruct)};
}
else if (strcmp(msParam.type, KeyValPair_MS_T) == 0) {
else if (std::strcmp(msParam.type, KeyValPair_MS_T) == 0) {
return boost::python::object{*static_cast<keyValPair_t*>(msParam.inOutStruct)};
}
else if (strcmp(msParam.type, DataObjLseekOut_MS_T) == 0) {
else if (std::strcmp(msParam.type, DataObjLseekOut_MS_T) == 0) {
return boost::python::object{*static_cast<fileLseekOut_t*>(msParam.inOutStruct)};
}
else if (strcmp(msParam.type, RodsObjStat_MS_T) == 0) {
else if (std::strcmp(msParam.type, RodsObjStat_MS_T) == 0) {
return boost::python::object{*static_cast<rodsObjStat_t*>(msParam.inOutStruct)};
}
else if (strcmp(msParam.type, INT_MS_T) == 0) {
else if (std::strcmp(msParam.type, INT_MS_T) == 0) {
return boost::python::object{*static_cast<int*>(msParam.inOutStruct)};
}
else if (strcmp(msParam.type, FLOAT_MS_T) == 0) {
else if (std::strcmp(msParam.type, FLOAT_MS_T) == 0) {
return boost::python::object{*static_cast<float*>(msParam.inOutStruct)};
}
else if (strcmp(msParam.type, BUF_LEN_MS_T) == 0) {
else if (std::strcmp(msParam.type, BUF_LEN_MS_T) == 0) {
// clang-format off
return msParam.inpOutBuf
? boost::python::object{bytesBuf_t{msParam.inpOutBuf->len, msParam.inpOutBuf->buf}}
: boost::python::object{};
// clang-format on
}
else {
THROW(SYS_NOT_SUPPORTED, boost::format("Unknown type in msParam: [%s]") % msParam.type);
THROW(SYS_NOT_SUPPORTED, fmt::format("Unknown type in msParam: [{0}]", msParam.type));
}
}

Expand Down Expand Up @@ -403,8 +405,8 @@ void update_argument(boost::any& cpp_arg, boost::python::object& py_arg)
}
catch (const std::out_of_range&) {
//THROW(SYS_NOT_SUPPORTED,
// boost::format("Attempted to extract from a boost::python::object containing an "
// "unsupported type: %s") % boost::core::scoped_demangled_name{cpp_arg.type().name()}.get());
// fmt::format("Attempted to extract from a boost::python::object containing an "
// "unsupported type: {0}", boost::core::scoped_demangled_name{cpp_arg.type().name()}.get()));
}
catch (const boost::bad_any_cast&) {
THROW(SYS_NOT_SUPPORTED, "Failed any_cast when updating boost::any from boost:python::object");
Expand All @@ -429,8 +431,8 @@ boost::python::object object_from_any(boost::any& arg)
}
else {
THROW(SYS_NOT_SUPPORTED,
boost::format("Attempted to create a boost::python::object from a boost::any containing an "
"unsupported type: %s") % boost::core::scoped_demangled_name{arg.type().name()}.get());
fmt::format("Attempted to create a boost::python::object from a boost::any containing an "
"unsupported type: {0}", boost::core::scoped_demangled_name{arg.type().name()}.get()));
}
}
catch (const boost::bad_any_cast&) {
Expand Down
Loading