diff --git a/src/pya/pya.cc b/src/pya/pya.cc index 67cdb2857..88cd4127d 100644 --- a/src/pya/pya.cc +++ b/src/pya/pya.cc @@ -2331,45 +2331,6 @@ PythonInterpreter::PythonInterpreter () Py_InitializeEx (0 /*don't set signals*/); - if (add_path_from_file) { - - // If present, read the paths from a file in INST_PATH/.python-paths.txt. - // The content of this file is evaluated as an expression and the result - // is placed inside the Python path. - - try { - - QDir inst_dir (QCoreApplication::applicationDirPath ()); - QFileInfo fi (inst_dir.absoluteFilePath (tl::to_qstring(".python-paths.txt"))); - if (fi.exists ()) { - - tl::log << tl::to_string (QObject::tr ("Reading Python path from ")) << tl::to_string (fi.filePath ()); - - QFile paths_txt (fi.filePath ()); - paths_txt.open (QIODevice::ReadOnly); - - tl::Eval eval; - eval.set_global_var ("inst_path", tl::Variant (tl::to_string (inst_dir.absolutePath ()))); - tl::Expression ex; - eval.parse (ex, paths_txt.readAll ().constData ()); - tl::Variant v = ex.execute (); - - if (v.is_list ()) { - for (tl::Variant::iterator i = v.begin (); i != v.end (); ++i) { - add_path (i->to_string ()); - } - } - - } - - } catch (tl::Exception &ex) { - tl::error << tl::to_string (QObject::tr ("Evaluation of Python path expression failed")) << ": " << ex.msg (); - } catch (...) { - tl::error << tl::to_string (QObject::tr ("Evaluation of Python path expression failed")); - } - - } - // Set dummy argv[] // TODO: more? char *argv[1] = { make_string (app_path) }; diff --git a/src/tl/tlSystemPaths.cc b/src/tl/tlSystemPaths.cc index 4e3b66097..915cc7f9e 100644 --- a/src/tl/tlSystemPaths.cc +++ b/src/tl/tlSystemPaths.cc @@ -30,6 +30,8 @@ #ifdef _WIN32 # include +#else +# include #endif #include @@ -83,14 +85,14 @@ get_inst_path_internal () #else - QFileInfo proc_exe (tl::sprintf ("/proc/%d/exe"), getpid ()); + QFileInfo proc_exe (tl::to_qstring (tl::sprintf ("/proc/%d/exe", getpid ()))); if (proc_exe.exists () && proc_exe.isSymLink ()) { - return QFileInfo (proc_exe.canonicalFilePath ()).absolutePath (); + return tl::to_string (QFileInfo (proc_exe.canonicalFilePath ()).absolutePath ()); } #endif - // As a fallback use QCoreApplication::applicationDirPath, which however it not + // As a fallback use QCoreApplication::applicationDirPath, which however is not // available before QCoreApplication is initialized return tl::to_string (QCoreApplication::applicationDirPath ()); }