Skip to content

Commit 5c31c69

Browse files
authored
Merge pull request #458 from BigRoy/fix457
Fix #457: Remove schema validation when parsing containers
2 parents e771535 + b53e124 commit 5c31c69

3 files changed

Lines changed: 3 additions & 15 deletions

File tree

avalon/houdini/pipeline.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,11 @@ def containerise(name,
201201
return container
202202

203203

204-
def parse_container(container, validate=True):
204+
def parse_container(container):
205205
"""Return the container node's full container data.
206206
207207
Args:
208208
container (hou.Node): A container node name.
209-
validate(bool): turn the validation for the container on or off
210209
211210
Returns:
212211
dict: The container schema data for this container node.
@@ -221,9 +220,6 @@ def parse_container(container, validate=True):
221220
data["objectName"] = container.path()
222221
data["node"] = container
223222

224-
if validate:
225-
schema.validate(data)
226-
227223
return data
228224

229225

avalon/maya/pipeline.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -423,13 +423,11 @@ def containerise(name,
423423
return container
424424

425425

426-
def parse_container(container, validate=True):
426+
def parse_container(container):
427427
"""Return the container node's full container data.
428428
429429
Args:
430430
container (str): A container node name.
431-
validate (bool, optional): Whether to validate the container schema.
432-
Defaults to True.
433431
434432
Returns:
435433
dict: The container schema data for this container node.
@@ -443,9 +441,6 @@ def parse_container(container, validate=True):
443441
# Append transient data
444442
data["objectName"] = container
445443

446-
if validate:
447-
schema.validate(data)
448-
449444
return data
450445

451446

avalon/nuke/pipeline.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def containerise(node,
9999
return node
100100

101101

102-
def parse_container(node, validate=True):
102+
def parse_container(node):
103103
"""Returns containerised data of a node
104104
105105
This reads the imprinted data from `containerise`.
@@ -115,9 +115,6 @@ def parse_container(node, validate=True):
115115
# Store the node's name
116116
data["objectName"] = node["name"].value()
117117

118-
if validate:
119-
schema.validate(data)
120-
121118
return data
122119

123120

0 commit comments

Comments
 (0)