From efb23bee571a0365dc2ee15dbd55623104d0f3ec Mon Sep 17 00:00:00 2001 From: Ovidiu Mircescu Date: Thu, 12 Jul 2018 17:14:18 +0200 Subject: [PATCH] Use std::getenv instead of dirty python scam. --- src/evalyfx/YACSEvalSession.cxx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/evalyfx/YACSEvalSession.cxx b/src/evalyfx/YACSEvalSession.cxx index e8039658e..8b36a490d 100644 --- a/src/evalyfx/YACSEvalSession.cxx +++ b/src/evalyfx/YACSEvalSession.cxx @@ -27,6 +27,7 @@ #include #include +#include const char YACSEvalSession::KERNEL_ROOT_DIR[]="KERNEL_ROOT_DIR"; @@ -134,17 +135,7 @@ std::string YACSEvalSession::GetPathToAdd() std::string YACSEvalSession::GetConfigAndPort(int& port) { - YACS::ENGINE::AutoPyRef osPy(PyImport_ImportModule(const_cast("os")));//new - YACS::ENGINE::AutoPyRef environPy(PyObject_GetAttrString(osPy,const_cast("environ")));//new - // - YACS::ENGINE::AutoPyRef corbaConfigStr(PyBytes_FromString(const_cast(CORBA_CONFIG_ENV_VAR_NAME)));//new - YACS::ENGINE::AutoPyRef corbaConfigFileNamePy(PyObject_GetItem(environPy,corbaConfigStr));//new - std::string ret(PyBytes_AsString(corbaConfigFileNamePy)); - // - YACS::ENGINE::AutoPyRef nsPortStr(PyBytes_FromString(const_cast(NSPORT_VAR_NAME)));//new - YACS::ENGINE::AutoPyRef nsPortValuePy(PyObject_GetItem(environPy,nsPortStr));//new - std::string portStr(PyBytes_AsString(nsPortValuePy)); - std::istringstream iss(portStr); + std::istringstream iss(std::getenv(NSPORT_VAR_NAME)); iss >> port; - return ret; + return std::getenv(CORBA_CONFIG_ENV_VAR_NAME); } -- 2.39.2