Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove env var logic for pre-setshot #935

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove env var logic for pre-setshot #935

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61a3668
Remove env var logic for pre-setshot
Mar 7, 2021
db38d73
Update the test
Mar 7, 2021
d90e940
Merge branch 'master' into 548-remove-pre-setshot-logic
DiegoTavares May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions pyoutline/outline/backend/cue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
11 changes: 2 additions & 9 deletions pyoutline/outline/loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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(
Expand All @@ -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):
"""
Expand Down
4 changes: 0 additions & 4 deletions pyoutline/tests/loader_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down