Parcourir la source

[Fix] handle py3

monf il y a 7 ans
Parent
commit
c9ce87583d

+ 4 - 3
kalliope/core/Models/APIResponse.py

@@ -1,4 +1,4 @@
-
+import sys
 
 class APIResponse(object):
 
@@ -16,8 +16,9 @@ class APIResponse(object):
         :return: A dict of name and parameters
         :rtype: Dict
         """
-        if isinstance(self.user_order, unicode):
-            self.user_order = self.user_order.encode("utf-8")
+        if sys.version_info[0] < 3:
+            if isinstance(self.user_order, unicode):
+                self.user_order = self.user_order.encode("utf-8")
         return {
             'user_order': self.user_order,
             'matched_synapses': [e.serialize() for e in self.list_processed_matched_synapse],

+ 4 - 2
kalliope/core/NeuronLauncher.py

@@ -1,6 +1,7 @@
 import logging
 import six
 import jinja2
+import sys
 
 from kalliope.core.Utils.Utils import Utils
 from kalliope.core.ConfigurationManager.SettingLoader import SettingLoader
@@ -72,8 +73,9 @@ class NeuronLauncher:
                 # check that the parameter to replace is available in the loaded_parameters dict
                 if cls._neuron_parameters_are_available_in_loaded_parameters(neuron_parameters, loaded_parameters):
                     neuron_parameters = jinja2.Template(neuron_parameters).render(loaded_parameters)
-                    if isinstance(neuron_parameters, unicode):
-                        neuron_parameters = neuron_parameters.encode("utf-8")
+                    if sys.version_info[0] < 3:
+                        if isinstance(neuron_parameters, unicode):
+                            neuron_parameters = neuron_parameters.encode("utf-8")
                     return str(neuron_parameters)
                 else:
                     raise NeuronParameterNotAvailable

+ 3 - 2
kalliope/core/NeuronModule.py

@@ -113,8 +113,9 @@ class NeuronModule(object):
         :return: A dict of name and parameters
         :rtype: Dict
         """
-        if isinstance(self.tts_message, unicode):
-            self.tts_message = self.tts_message.encode("utf-8")
+        if sys.version_info[0] < 3:
+            if isinstance(self.tts_message, unicode):
+                self.tts_message = self.tts_message.encode("utf-8")
         return {
             'neuron_name': self.neuron_name,
             'generated_message': self.tts_message