vistel console fixes

hpcdgrie · Oct 7, 2024 · 056b7ba · 056b7ba
1 parent 765211c
commit 056b7ba
Showing 1 changed file with 21 additions and 39 deletions.
diff --git a/app/gui/vistleconsole.cpp b/app/gui/vistleconsole.cpp
@@ -281,51 +281,33 @@ void VistleConsole::init()
 #endif
 
     try {
-#ifdef USE_RLCOMPLETER
-        PyRun_SimpleString("import sys\n"
-
-                           "import _redirector\n"
-                           "sys.stdout = _redirector.redirector()\n"
-                           "sys.stderr = _redirector.redirector(True)\n"
-
-                           "sys.path.insert(0, \".\")\n" // add current path
-
-                           "import _console\n"
-
-                           "import builtins\n"
-                           "builtins.clear=_console.clear\n"
-                           "builtins.reset=_console.reset\n"
-                           "builtins.save=_console.save\n"
-                           "builtins.load=_console.load\n"
-                           "builtins.history=_console.history\n"
-                           //"builtins.quit=_console.quit\n"
-                           //"builtins.exit=_console.quit\n"
-                           "builtins.input=_console.raw_input\n"
-                           "import rlcompleter\n"
-                           "builtins.completer=rlcompleter.Completer()\n");
-#else
-        PyRun_SimpleString("import sys\n"
+        std::string pyCode = "import sys\n"
 
-                           "import _redirector\n"
-                           "sys.stdout = _redirector.redirector()\n"
-                           "sys.stderr = _redirector.redirector(True)\n"
+                             "import _redirector\n"
+                             "sys.stdout = _redirector.redirector()\n"
+                             "sys.stderr = _redirector.redirector(True)\n"
 
-                           "sys.path.insert(0, \".\")\n" // add current path
+                             "sys.path.insert(0, \".\")\n" // add current path
 
-                           "import _console\n"
+                             "import _console\n"
 
-                           "import builtins\n"
-                           "builtins.clear=_console.clear\n"
-                           "builtins.reset=_console.reset\n"
-                           "builtins.save=_console.save\n"
-                           "builtins.load=_console.load\n"
-                           "builtins.history=_console.history\n"
-                           //"builtins.quit=_console.quit\n"
-                           //"builtins.exit=_console.quit\n"
-                           "builtins.input=_console.raw_input\n"
+                             "import builtins\n"
+                             "builtins.clear=_console.clear\n"
+                             "builtins.reset=_console.reset\n"
+                             "builtins.save=_console.save\n"
+                             "builtins.load=_console.load\n"
+                             "builtins.history=_console.history\n"
+                             //"builtins.quit=_console.quit\n"
+                             //"builtins.exit=_console.quit\n"
+                             "builtins.input=_console.raw_input\n"
 
-        );
+#ifdef USE_RLCOMPLETER
+                             "import rlcompleter\n"
+                             "builtins.completer=rlcompleter.Completer()\n"
 #endif
+            ;
+        PyRun_SimpleString(pyCode.c_str());
+
     } catch (...) {
         std::cerr << "error running Python initialisation" << std::endl;
     }