Skip to content

Commit 02dba98

Browse files
committed
tidy up imports, fix pep8 issues
1 parent 15b13ea commit 02dba98

File tree

1 file changed

+30
-42
lines changed

1 file changed

+30
-42
lines changed

nipype/pipeline/engine/workflows.py

Lines changed: 30 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,38 @@
1515
1616
"""
1717
from __future__ import print_function, division, unicode_literals, absolute_import
18-
from builtins import range, object, str, bytes, open
19-
20-
# Py2 compat: http://python-future.org/compatible_idioms.html#collections-counter-and-ordereddict
21-
from future import standard_library
22-
standard_library.install_aliases()
18+
from builtins import str, bytes, open
2319

20+
import os
21+
import os.path as op
22+
import sys
2423
from datetime import datetime
25-
2624
from copy import deepcopy
2725
import pickle
28-
import os
29-
import os.path as op
3026
import shutil
31-
import sys
3227
from warnings import warn
3328

3429
import numpy as np
3530
import networkx as nx
3631

37-
3832
from ... import config, logging
39-
40-
from ...utils.misc import (unflatten, str2bool)
33+
from ...utils.misc import str2bool
4134
from ...utils.functions import (getsource, create_function_from_source)
42-
from ...interfaces.base import (traits, InputMultiPath, CommandLine,
43-
Undefined, TraitedSpec, DynamicTraitedSpec,
44-
Bunch, InterfaceResult, md5, Interface,
45-
TraitDictObject, TraitListObject, isdefined)
46-
47-
from ...utils.filemanip import (save_json, FileNotFoundError,
48-
filename_to_list, list_to_filename,
49-
copyfiles, fnames_presuffix, loadpkl,
50-
split_filename, load_json, makedirs, savepkl,
51-
write_rst_header, write_rst_dict,
52-
write_rst_list, to_str)
53-
from .utils import (generate_expanded_graph, modify_paths,
54-
export_graph, write_workflow_prov,
55-
write_workflow_resources,
56-
clean_working_directory, format_dot, topological_sort,
57-
get_print_name, merge_dict, evaluate_connect_function,
58-
_write_inputs, format_node)
35+
from ...interfaces.base import (
36+
traits, TraitedSpec, TraitDictObject, TraitListObject)
37+
from ...utils.filemanip import save_json, makedirs, to_str
38+
from .utils import (
39+
generate_expanded_graph, export_graph, write_workflow_prov,
40+
write_workflow_resources, format_dot, topological_sort,
41+
get_print_name, merge_dict, format_node
42+
)
5943

6044
from .base import EngineBase
61-
from .nodes import Node, MapNode
45+
from .nodes import MapNode
46+
47+
# Py2 compat: http://python-future.org/compatible_idioms.html#collections-counter-and-ordereddict
48+
from future import standard_library
49+
standard_library.install_aliases()
6250

6351
logger = logging.getLogger('workflow')
6452

@@ -202,16 +190,16 @@ def connect(self, *args, **kwargs):
202190
connected.
203191
""" % (srcnode, source, destnode, dest, dest, destnode))
204192
if not (hasattr(destnode, '_interface') and
205-
('.io' in str(destnode._interface.__class__) or
206-
any(['.io' in str(val) for val in
207-
destnode._interface.__class__.__bases__]))
193+
('.io' in str(destnode._interface.__class__) or
194+
any(['.io' in str(val) for val in
195+
destnode._interface.__class__.__bases__]))
208196
):
209197
if not destnode._check_inputs(dest):
210198
not_found.append(['in', destnode.name, dest])
211199
if not (hasattr(srcnode, '_interface') and
212-
('.io' in str(srcnode._interface.__class__)
213-
or any(['.io' in str(val) for val in
214-
srcnode._interface.__class__.__bases__]))):
200+
('.io' in str(srcnode._interface.__class__) or
201+
any(['.io' in str(val)
202+
for val in srcnode._interface.__class__.__bases__]))):
215203
if isinstance(source, tuple):
216204
# handles the case that source is specified
217205
# with a function
@@ -930,13 +918,13 @@ def _get_dot(self, prefix=None, hierarchy=None, colored=False,
930918
prefix = ' '
931919
if hierarchy is None:
932920
hierarchy = []
933-
colorset = ['#FFFFC8', # Y
934-
'#0000FF', '#B4B4FF', '#E6E6FF', # B
935-
'#FF0000', '#FFB4B4', '#FFE6E6', # R
936-
'#00A300', '#B4FFB4', '#E6FFE6', # G
937-
'#0000FF', '#B4B4FF'] # loop B
921+
colorset = ['#FFFFC8', # Y
922+
'#0000FF', '#B4B4FF', '#E6E6FF', # B
923+
'#FF0000', '#FFB4B4', '#FFE6E6', # R
924+
'#00A300', '#B4FFB4', '#E6FFE6', # G
925+
'#0000FF', '#B4B4FF'] # loop B
938926
if level > len(colorset) - 2:
939-
level = 3 # Loop back to blue
927+
level = 3 # Loop back to blue
940928

941929
dotlist = ['%slabel="%s";' % (prefix, self.name)]
942930
for node in nx.topological_sort(self._graph):

0 commit comments

Comments
 (0)