Merge remote-tracking branch 'origin/master' into V9_dev

[modules/yacs.git] / src / runtime / SalomePythonNode.cxx

diff --git a/src/runtime/SalomePythonNode.cxx b/src/runtime/SalomePythonNode.cxx
index 773efe7addb08c23108def53bab38683661224e6..6ea9787122c49c768b64d29a9608f074215c4e89 100644 (file)
--- a/src/runtime/SalomePythonNode.cxx
+++ b/src/runtime/SalomePythonNode.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -72,7 +72,7 @@ void SalomePythonNode::load()
   cerr << "---------------SalomePythonNode::load function---------------" << endl;
   list<OutputPort *>::iterator iter;
   string value2Export=((SalomePythonComponent*)_component)->getStringValueToExportInInterp(this);
-  PyObject* ob=PyString_FromString(value2Export.c_str());
+  PyObject* ob=PyBytes_FromString(value2Export.c_str());
   PyDict_SetItemString(_context,PLACEMENT_VAR_NAME_IN_INTERP,ob);
   for(iter = _setOfOutputPort.begin(); iter != _setOfOutputPort.end(); iter++)
     {
@@ -194,8 +194,8 @@ void SalomePythonNode::execute()
 
 std::string SalomePythonNode::getKind() const
 {
-  //This not a bug !!! Returns SalomeNode::KIND to be managed by SalomeContainer.
-  return SalomeNode::KIND;
+  static const char LOC_KIND[]="";
+  return LOC_KIND;
 }
 
 Node *SalomePythonNode::simpleClone(ComposedNode *father, bool editionOnly) const