From: Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
Date: Wed, 3 Oct 2018 13:16:57 +0000 (+0200)
Subject: Improvement to idefix porting to py3.
X-Git-Tag: V9_2_0a2~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=85a5a51bac6c5744c23146d33a603478605c994c;p=modules%2Fyacs.git

Improvement to idefix porting to py3.
---

diff --git a/src/evalyfx/YACSEvalSessionInternal.cxx b/src/evalyfx/YACSEvalSessionInternal.cxx
index c67f1402f..bf66dc94a 100644
--- a/src/evalyfx/YACSEvalSessionInternal.cxx
+++ b/src/evalyfx/YACSEvalSessionInternal.cxx
@@ -48,17 +48,10 @@ Engines::SalomeLauncher_var YACSEvalSession::YACSEvalSessionInternal::goFetching
   const char fetchPyCmd[]="import salome,CORBA\nsalome.salome_init()\nsl=salome.naming_service.Resolve(\"/SalomeLauncher\")\nif not CORBA.is_nil(sl):\n  return salome.orb.object_to_string(sl)\nelse:\n  raise Exception(\"Impossible to locate salome launcher !\")";
   YACS::ENGINE::AutoPyRef func(YACS::ENGINE::evalPy(methName,fetchPyCmd));
   YACS::ENGINE::AutoPyRef val(YACS::ENGINE::evalFuncPyWithNoParams(func));
-  std::string ior("");
+  std::string ior;
   if (PyUnicode_Check(val))
-  {
-    PyObject * temp_bytes = PyUnicode_AsEncodedString(val, "UTF-8", "strict"); // Owned reference
-    if (temp_bytes != NULL)
-    {
-      ior = PyBytes_AS_STRING(temp_bytes); // Borrowed pointer
-      Py_DECREF(temp_bytes);
-    }
-  }
-  if(ior == "")
+    ior = PyUnicode_AsUTF8(val);
+  else
     throw YACS::Exception("goFetchingSalomeLauncherInNS: python call error. ");
   CORBA::Object_var obj(string_to_object(ior));
   if(CORBA::is_nil(obj))
diff --git a/src/evalyfx/YACSEvalYFXPattern.cxx b/src/evalyfx/YACSEvalYFXPattern.cxx
index 7324f50b6..8cfdf6629 100644
--- a/src/evalyfx/YACSEvalYFXPattern.cxx
+++ b/src/evalyfx/YACSEvalYFXPattern.cxx
@@ -899,32 +899,16 @@ void YACSEvalYFXGraphGenCluster::generateGraph()
   //
   YACS::ENGINE::AutoPyRef func(YACS::ENGINE::evalPy(EFXGenFileName,EFXGenContent));
   YACS::ENGINE::AutoPyRef val(YACS::ENGINE::evalFuncPyWithNoParams(func));
-  _locSchemaFile="";
   if (PyUnicode_Check(val))
-  {
-    PyObject * temp_bytes = PyUnicode_AsEncodedString(val, "UTF-8", "strict"); // Owned reference
-    if (temp_bytes != NULL)
-    {
-      _locSchemaFile = PyBytes_AS_STRING(temp_bytes); // Borrowed pointer
-      Py_DECREF(temp_bytes);
-    }
-  }
-  if(_locSchemaFile == "")
+    _locSchemaFile = PyUnicode_AsUTF8(val);
+  else
     throw YACS::Exception("YACSEvalYFXGraphGenCluster::generateGraph: python call error. ");
 
   func=YACS::ENGINE::evalPy(EFXGenFileName,EFXGenContent2);
   val=YACS::ENGINE::evalFuncPyWithNoParams(func);
-  _jobName="";
   if (PyUnicode_Check(val))
-  {
-    PyObject * temp_bytes = PyUnicode_AsEncodedString(val, "UTF-8", "strict"); // Owned reference
-    if (temp_bytes != NULL)
-    {
-      _jobName = PyBytes_AS_STRING(temp_bytes); // Borrowed pointer
-      Py_DECREF(temp_bytes);
-    }
-  }
-  if(_jobName == "")
+    _jobName = PyUnicode_AsUTF8(val);
+  else
     throw YACS::Exception("YACSEvalYFXGraphGenCluster::generateGraph: python call error. ");
 
   class ClusterPatcher : public YACSEvalYFXGraphGen::CustomPatcher