提交 63a35bdc authored 作者: Frederic Bastien's avatar Frederic Bastien

white space fix.

上级 7d42c60d
...@@ -421,22 +421,22 @@ class Method(Component): ...@@ -421,22 +421,22 @@ class Method(Component):
_inputs = [x.variable for x in inputs] _inputs = [x.variable for x in inputs]
# Grab the variables that are not accessible from either the inputs or the updates. # Grab the variables that are not accessible from either the inputs or the updates.
if outputs is None: if outputs is None:
outputs_list = [] outputs_list = []
else: else:
if isinstance(outputs, (list, tuple)): if isinstance(outputs, (list, tuple)):
outputs_list = list(outputs) outputs_list = list(outputs)
else: else:
outputs_list = [outputs] outputs_list = [outputs]
#backport #backport
#outputs_list = [] if outputs is None else (list(outputs) if isinstance(outputs, (list, tuple)) else [outputs]) #outputs_list = [] if outputs is None else (list(outputs) if isinstance(outputs, (list, tuple)) else [outputs])
outputs_variable_list = [] outputs_variable_list = []
for o in outputs_list: for o in outputs_list:
if isinstance(o, io.Out): if isinstance(o, io.Out):
outputs_variable_list += [o.variable] outputs_variable_list += [o.variable]
else: else:
outputs_variable_list += [o] outputs_variable_list += [o]
#backport #backport
#outputs_variable_list = [o.variable if isinstance(o, io.Out) else o for o in outputs_list] #outputs_variable_list = [o.variable if isinstance(o, io.Out) else o for o in outputs_list]
...@@ -469,9 +469,9 @@ class Method(Component): ...@@ -469,9 +469,9 @@ class Method(Component):
inputs.append(storage) inputs.append(storage)
if self.mode is None: if self.mode is None:
effective_mode = mode effective_mode = mode
else: else:
effective_mode = self.mode effective_mode = self.mode
#backport #backport
#effective_mode = mode if self.mode is None else self.mode #effective_mode = mode if self.mode is None else self.mode
...@@ -486,9 +486,9 @@ class Method(Component): ...@@ -486,9 +486,9 @@ class Method(Component):
else: else:
rval = '' rval = ''
if isinstance(self.outputs, (list, tuple)): if isinstance(self.outputs, (list, tuple)):
inputs, outputs, updates = self.inputs, self.outputs inputs, outputs, updates = self.inputs, self.outputs
else: else:
inputs, outputs, updates = [self.outputs], self.updates inputs, outputs, updates = [self.outputs], self.updates
#backport #backport
#inputs, outputs, updates = self.inputs, self.outputs if isinstance(self.outputs, (list, tuple)) else [self.outputs], self.updates #inputs, outputs, updates = self.inputs, self.outputs if isinstance(self.outputs, (list, tuple)) else [self.outputs], self.updates
...@@ -505,9 +505,9 @@ class Method(Component): ...@@ -505,9 +505,9 @@ class Method(Component):
def __str__(self): def __str__(self):
if self.updates: if self.updates:
sep = "; " sep = "; "
else: else:
sep = "" sep = ""
return "Method(%s -> %s%s%s)" % \ return "Method(%s -> %s%s%s)" % \
(self.inputs, (self.inputs,
self.outputs, self.outputs,
...@@ -1095,9 +1095,9 @@ class Module(ComponentDict): ...@@ -1095,9 +1095,9 @@ class Module(ComponentDict):
# to look for submodules on which make_module_instance needs to be called # to look for submodules on which make_module_instance needs to be called
def recurse(v): def recurse(v):
if isinstance(v,list): if isinstance(v,list):
iter = enumerate(v) iter = enumerate(v)
else: else:
iter = v.iteritems() iter = v.iteritems()
#backport #backport
#iter = enumerate(v) if isinstance(v,list) else v.iteritems() #iter = enumerate(v) if isinstance(v,list) else v.iteritems()
for sk,sv in iter: for sk,sv in iter:
......
...@@ -476,6 +476,4 @@ def iter_over_pairs(pairs): ...@@ -476,6 +476,4 @@ def iter_over_pairs(pairs):
if isinstance(pairs, dict): if isinstance(pairs, dict):
return pairs.iteritems() return pairs.iteritems()
else: else:
return pairs return pairs
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论