From 8ed99e57594f837c5abbbe7c858fca929c87fec5 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej@samohel.cz>
Date: Tue, 3 Dec 2019 19:02:16 +0100
Subject: [PATCH 1/2] fixed environment passing to subprocess

---
 pype/lib.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pype/lib.py b/pype/lib.py
index e41f9eb8bc..f4820a1962 100644
--- a/pype/lib.py
+++ b/pype/lib.py
@@ -19,12 +19,15 @@ log = logging.getLogger(__name__)
 def _subprocess(args):
     """Convenience method for getting output errors for subprocess."""
 
+    # make sure environment contains only strings
+    env = {k: str(v) for k, v in os.environ.items()}
+
     proc = subprocess.Popen(
         args,
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
         stdin=subprocess.PIPE,
-        env=os.environ
+        env=env
     )
 
     output = proc.communicate()[0]

From bcf32d80469cf849e0c1d4a38d086a8cebf08d2c Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej@samohel.cz>
Date: Tue, 3 Dec 2019 22:00:25 +0100
Subject: [PATCH 2/2] fixed pype root handling during publshing of image
 sequences

---
 pype/scripts/publish_filesequence.py | 37 +++++++++++++++++++---------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/pype/scripts/publish_filesequence.py b/pype/scripts/publish_filesequence.py
index 25ed4135c3..7ad7318831 100644
--- a/pype/scripts/publish_filesequence.py
+++ b/pype/scripts/publish_filesequence.py
@@ -4,6 +4,7 @@ import os
 import logging
 import subprocess
 import platform
+from shutil import which
 
 handler = logging.basicConfig()
 log = logging.getLogger("Publish Image Sequences")
@@ -35,22 +36,32 @@ def __main__():
     auto_pype_root = os.path.abspath(auto_pype_root + "../../../../..")
     auto_pype_root = os.environ.get('PYPE_ROOT') or auto_pype_root
 
-    if kwargs.pype:
-        pype_root = kwargs.pype
-    else:
-        # if pype argument not specified, lets assume it is set in PATH
-        pype_root = ""
-
-    print("Set pype root to: {}".format(pype_root))
-    print("Paths: {}".format(kwargs.paths or [os.getcwd()]))
-
-    paths = kwargs.paths or [os.getcwd()]
     pype_command = "pype.ps1"
     if platform.system().lower() == "linux":
         pype_command = "pype"
     elif platform.system().lower() == "windows":
         pype_command = "pype.bat"
 
+    if kwargs.pype:
+        pype_root = kwargs.pype
+    else:
+        # test if pype.bat / pype is in the PATH
+        # if it is, which() will return its path and we use that.
+        # if not, we use auto_pype_root path. Caveat of that one is
+        # that it can be UNC path and that will not work on windows.
+
+        pype_path = which(pype_command)
+
+        if pype_path:
+            pype_root = os.path.dirname(pype_path)
+        else:
+            pype_root = auto_pype_root
+
+    print("Set pype root to: {}".format(pype_root))
+    print("Paths: {}".format(kwargs.paths or [os.getcwd()]))
+
+    paths = kwargs.paths or [os.getcwd()]
+
     args = [
         os.path.join(pype_root, pype_command),
         "publish",
@@ -60,9 +71,11 @@ def __main__():
     print("Pype command: {}".format(" ".join(args)))
     # Forcing forwaring the environment because environment inheritance does
     # not always work.
-    exit_code = subprocess.call(args, env=os.environ)
+    # Cast all values in environment to str to be safe
+    env = {k: str(v) for k, v in os.environ.items()}
+    exit_code = subprocess.call(args, env=env)
     if exit_code != 0:
-        raise ValueError("Publishing failed.")
+        raise RuntimeError("Publishing failed.")
 
 
 if __name__ == '__main__':