From 61a36681a40ea95d38422bc61aa59661261374db Mon Sep 17 00:00:00 2001
From: Lars van der Bijl <lars@electrictheatre.tv>
Date: Sun, 7 Mar 2021 11:41:22 +0000
Subject: [PATCH 1/2] Remove env var logic for pre-setshot

Logic seems SPI specific, remove it from the opensource.

Closes #548
---
 pyoutline/outline/backend/cue.py |  7 ++-----
 pyoutline/outline/loader.py      | 11 ++---------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pyoutline/outline/backend/cue.py b/pyoutline/outline/backend/cue.py
index 1d91eb70a..ea13b41f0 100644
--- a/pyoutline/outline/backend/cue.py
+++ b/pyoutline/outline/backend/cue.py
@@ -270,11 +270,8 @@ def _serialize(launcher, use_pycuerun):
 
     env = Et.SubElement(j, "env")
     for env_k, env_v in ol.get_env().items():
-        # Only pre-setshot environment variables are
-        # passed up to the cue.
-        if env_v[1]:
-            pair = Et.SubElement(env, "key", {"name": env_k})
-            pair.text = env_v[0]
+        pair = Et.SubElement(env, "key", {"name": env_k})
+        pair.text = env_v
 
     layers = Et.SubElement(j, "layers")
     for layer in ol.get_layers():
diff --git a/pyoutline/outline/loader.py b/pyoutline/outline/loader.py
index f58ad46ea..d043e4a32 100644
--- a/pyoutline/outline/loader.py
+++ b/pyoutline/outline/loader.py
@@ -678,7 +678,7 @@ def get_frame_range(self):
         """
         return self.__frame_range
 
-    def set_env(self, key, value, pre=False):
+    def set_env(self, key, value):
         """
         Set an environment variable that is propigated to
         every frame.
@@ -688,13 +688,6 @@ def set_env(self, key, value, pre=False):
 
         :type value: str
         :param value: Value to associate with the name.
-
-        :type pre: boolean
-        :param pre: If this value is set to true, the environement
-                    variable is applied pre-setshot.  The default
-                    is for the environment variable to be set
-                    post set shot.
-
         """
         if key in self.__env:
             logger.warning(
@@ -708,7 +701,7 @@ def set_env(self, key, value, pre=False):
             raise outline.exception.OutlineException(
                 "Invalid value type for env var: %s" % type(value))
 
-        self.__env[key] = (value, pre)
+        self.__env[key] = value
 
     def get_env(self, key=None):
         """

From db38d7392095006070992e5a098099f36d432faa Mon Sep 17 00:00:00 2001
From: Lars van der Bijl <lars@electrictheatre.tv>
Date: Sun, 7 Mar 2021 12:01:52 +0000
Subject: [PATCH 2/2] Update the test

---
 pyoutline/tests/loader_test.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pyoutline/tests/loader_test.py b/pyoutline/tests/loader_test.py
index 989c085c2..ebcb07368 100644
--- a/pyoutline/tests/loader_test.py
+++ b/pyoutline/tests/loader_test.py
@@ -90,12 +90,8 @@ def test_get_set_env(self):
             ol = outline.load_outline(self.path)
 
             ol.set_env("ENV_1", "a")
-            ol.set_env("ENV_2", "b", True)
 
             self.assertEqual(ol.get_env("ENV_1"), "a")
-            self.assertFalse(ol.get_env()["ENV_1"][1])
-            self.assertEqual(ol.get_env("ENV_2"), "b")
-            self.assertTrue(ol.get_env()["ENV_2"][1])
 
     def test_add_get_remove_layer(self):
         with test_utils.TemporarySessionDirectory():