Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
genotoul-bioinfo
jflow
Commits
fa3af58e
Commit
fa3af58e
authored
Sep 24, 2015
by
Jerome Mariette
Browse files
ok for python 3.4
parent
debc1f59
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/jflow/workflow.py
View file @
fa3af58e
...
...
@@ -594,7 +594,7 @@ class Workflow(threading.Thread):
"""
odict
=
self
.
__dict__
.
copy
()
del
odict
[
'_started'
]
del
odict
[
'_
b
lock'
]
del
odict
[
'_
tstate_
lock'
]
del
odict
[
'_stderr'
]
if
'external_components'
in
odict
:
del
odict
[
'external_components'
]
...
...
@@ -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
:
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
cmpt_object
=
getattr
(
my_pckge
,
component_name
)()
cmpt_object
.
output_directory
=
self
.
get_component_output_directory
(
component_name
,
component_prefix
)
...
...
@@ -1111,7 +1111,7 @@ class Workflow(threading.Thread):
""" Import ``symbols`` from ``module`` into global namespace. """
# Import 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
# an attribute for later use (i.e. during compile)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment