Porting to Python 3 (1st draft)

[modules/med.git] / src / MEDCalculator / Swig / SPythonInterpreter.cxx

diff --git a/src/MEDCalculator/Swig/SPythonInterpreter.cxx b/src/MEDCalculator/Swig/SPythonInterpreter.cxx
index 3c3de5adccd0a6bfae94642c070f76f57cdabd25..c73533399334b5c0cdda4b75bdb355bcf248ac5a 100644 (file)
--- a/src/MEDCalculator/Swig/SPythonInterpreter.cxx
+++ b/src/MEDCalculator/Swig/SPythonInterpreter.cxx
@@ -193,12 +193,14 @@ bool SPythonInterpreter::isSPythonExpression(const std::string& s)
     return false;
   if(w.find("del ")!=std::string::npos)
     return false;
-  const char PRINT[]="print ";
+  const char PRINT[]="print(";
+  const char ENDPRINT[]=")";
   bool isPrint=w.find(PRINT)!=std::string::npos;
+  isPrint &= w.find(ENDPRINT)!=std::string::npos;
   if(isPrint)
     {
       std::size_t p=w.find(PRINT);
-      w=w.substr(p+sizeof(PRINT)-1);
+      w=w.substr(p+sizeof(PRINT)-sizeof(ENDPRINT)-1);
     }
   std::string result;
   if(!isSPythonExpressionLev1(w,result))