Added compatibility for python2 in replyToWrapper.

nayarsystems · Jun 26, 2018 · 3bf270c · 3bf270c
1 parent c04075f
commit 3bf270c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/nxsugarpy/config.py b/nxsugarpy/config.py
@@ -327,4 +327,4 @@ def getConfig():
     if err != None:
         logWithFields(ErrorLevel, "config", errM, err)
         return None, err
-    return _config, None
+    return _config, None
diff --git a/nxsugarpy/service.py b/nxsugarpy/service.py
@@ -26,6 +26,7 @@
 from nxsugarpy.helpers import *
 from nxsugarpy.stats import *
 from nxsugarpy.signal import  *
+from six import string_types
 
 import time
 import threading
@@ -688,7 +689,7 @@ def replyToWrapper(f):
     def wrapped(task):
         if isinstance(task.params, dict) and "replyTo" in task.params and isinstance(task.params["replyTo"], dict):
             replyTo = task.params["replyTo"]
-            if "path" in replyTo and isinstance(replyTo["path"], str) and "type" in replyTo and isinstance(replyTo["type"], str) and replyTo["type"] in ["pipe", "service"]:
+            if "path" in replyTo and isinstance(replyTo["path"], string_types) and "type" in replyTo and isinstance(replyTo["type"], string_types) and replyTo["type"] in ["pipe", "service"]:
                 res, errm = f(task)
                 task.tags["@local-repliedTo"] = True
                 _, err = task.accept()