Commit fa3af58e authored by Jerome Mariette's avatar Jerome Mariette
Browse files

ok for python 3.4

parent debc1f59
...@@ -594,7 +594,7 @@ class Workflow(threading.Thread): ...@@ -594,7 +594,7 @@ class Workflow(threading.Thread):
""" """
odict = self.__dict__.copy() odict = self.__dict__.copy()
del odict['_started'] del odict['_started']
del odict['_block'] del odict['_tstate_lock']
del odict['_stderr'] del odict['_stderr']
if 'external_components' in odict: if 'external_components' in odict:
del odict['external_components'] del odict['external_components']
...@@ -699,7 +699,7 @@ class Workflow(threading.Thread): ...@@ -699,7 +699,7 @@ class Workflow(threading.Thread):
if component_name in self.internal_components or component_name in self.external_components: if component_name in self.internal_components or component_name in self.external_components:
if component_name in self.internal_components: if component_name in self.internal_components:
my_pckge = __import__(self.internal_components[component_name], globals(), locals(), [component_name], -1) my_pckge = __import__(self.internal_components[component_name], globals(), locals(), [component_name])
# build the object and define required field # build the object and define required field
cmpt_object = getattr(my_pckge, component_name)() cmpt_object = getattr(my_pckge, component_name)()
cmpt_object.output_directory = self.get_component_output_directory(component_name, component_prefix) cmpt_object.output_directory = self.get_component_output_directory(component_name, component_prefix)
...@@ -1111,7 +1111,7 @@ class Workflow(threading.Thread): ...@@ -1111,7 +1111,7 @@ class Workflow(threading.Thread):
""" Import ``symbols`` from ``module`` into global namespace. """ """ Import ``symbols`` from ``module`` into global namespace. """
# Import module # Import module
m = 'weaver.{0}'.format(module) m = 'weaver.{0}'.format(module)
m = __import__(m, self.globals, self.globals, symbols, -1) m = __import__(m, self.globals, self.globals, symbols)
# Import symbols from module into global namespace, which we store as # Import symbols from module into global namespace, which we store as
# an attribute for later use (i.e. during compile) # an attribute for later use (i.e. during compile)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment