Commit d26bd267 authored by Nikita Sirgienko's avatar Nikita Sirgienko
Browse files

Improve Python build for Windows via python macros deployment

parent 4273ccdc
...@@ -165,7 +165,7 @@ void PythonServer::setFilePath(const string& path, const string& dir) ...@@ -165,7 +165,7 @@ void PythonServer::setFilePath(const string& path, const string& dir)
string PythonServer::variables(bool parseValue) const string PythonServer::variables(bool parseValue) const
{ {
PyRun_SimpleString( PyRun_SimpleStringFlags(
"try: \n" "try: \n"
" import numpy \n" " import numpy \n"
" __cantor_numpy_internal__ = numpy.get_printoptions()['threshold'] \n" " __cantor_numpy_internal__ = numpy.get_printoptions()['threshold'] \n"
...@@ -175,7 +175,7 @@ string PythonServer::variables(bool parseValue) const ...@@ -175,7 +175,7 @@ string PythonServer::variables(bool parseValue) const
#elif PY_MAJOR_VERSION == 2 #elif PY_MAJOR_VERSION == 2
"except ImportError: \n" "except ImportError: \n"
#endif #endif
" pass \n" " pass \n", NULL
); );
PyRun_SimpleString("__tmp_globals__ = globals()"); PyRun_SimpleString("__tmp_globals__ = globals()");
...@@ -210,7 +210,7 @@ string PythonServer::variables(bool parseValue) const ...@@ -210,7 +210,7 @@ string PythonServer::variables(bool parseValue) const
vars.push_back(keyString + char(17) + valueString); vars.push_back(keyString + char(17) + valueString);
} }
PyRun_SimpleString( PyRun_SimpleStringFlags(
"try: \n" "try: \n"
" import numpy \n" " import numpy \n"
" numpy.set_printoptions(threshold=__cantor_numpy_internal__) \n" " numpy.set_printoptions(threshold=__cantor_numpy_internal__) \n"
...@@ -220,7 +220,7 @@ string PythonServer::variables(bool parseValue) const ...@@ -220,7 +220,7 @@ string PythonServer::variables(bool parseValue) const
#elif PY_MAJOR_VERSION == 2 #elif PY_MAJOR_VERSION == 2
"except ImportError: \n" "except ImportError: \n"
#endif #endif
" pass \n" " pass \n", NULL
); );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment