@@ -26,9 +26,9 @@ def check_types(srctype, sinktype, linkMerge, valueFrom):
26
26
"""Check if the source and sink types are "pass", "warning", or "exception".
27
27
"""
28
28
29
- if valueFrom :
29
+ if valueFrom is not None :
30
30
return "pass"
31
- if not linkMerge :
31
+ if linkMerge is None :
32
32
if can_assign_src_to_sink (srctype , sinktype , strict = True ):
33
33
return "pass"
34
34
if can_assign_src_to_sink (srctype , sinktype , strict = False ):
@@ -39,7 +39,7 @@ def check_types(srctype, sinktype, linkMerge, valueFrom):
39
39
_get_type (sinktype ), None , None )
40
40
if linkMerge == "merge_flattened" :
41
41
return check_types (merge_flatten_type (_get_type (srctype )), _get_type (sinktype ), None , None )
42
- raise WorkflowException (u"Unrecognized linkMerge enu_m '{}'" .format (linkMerge ))
42
+ raise WorkflowException (u"Unrecognized linkMerge enum '{}'" .format (linkMerge ))
43
43
44
44
45
45
def merge_flatten_type (src ):
@@ -179,7 +179,7 @@ def static_checker(workflow_inputs, workflow_outputs, step_inputs, step_outputs,
179
179
SourceLine (sink , "type" ).makeError (
180
180
" with sink '%s' of type %s"
181
181
% (shortname (sink ["id" ]), json_dumps (sink ["type" ])))
182
- if linkMerge :
182
+ if linkMerge is not None :
183
183
msg += "\n " + SourceLine (sink ).makeError (" source has linkMerge method %s" % linkMerge )
184
184
185
185
warning_msgs .append (msg )
@@ -193,7 +193,7 @@ def static_checker(workflow_inputs, workflow_outputs, step_inputs, step_outputs,
193
193
SourceLine (sink , "type" ).makeError (
194
194
" with sink '%s' of type %s"
195
195
% (shortname (sink ["id" ]), json_dumps (sink ["type" ])))
196
- if linkMerge :
196
+ if linkMerge is not None :
197
197
msg += "\n " + SourceLine (sink ).makeError (" source has linkMerge method %s" % linkMerge )
198
198
exception_msgs .append (msg )
199
199
0 commit comments