Skip to content

Commit 252649b

Browse files
author
Ben Cipollini
committed
RF: remove past.builtins; use six.string_types
1 parent f67c85d commit 252649b

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

nipype/pipeline/engine.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
standard_library.install_aliases()
1616
from builtins import range
1717
from builtins import object
18-
from past.builtins import basestring
1918

2019
from datetime import datetime
2120
from nipype.utils.misc import flatten, unflatten
@@ -42,10 +41,10 @@
4241
from hashlib import sha1
4342

4443
import numpy as np
44+
import networkx as nx
4545

4646
from ..utils.misc import package_check, str2bool
4747
package_check('networkx', '1.3')
48-
import networkx as nx
4948

5049
from .. import config, logging
5150
logger = logging.getLogger('workflow')
@@ -669,7 +668,7 @@ def run(self, plugin=None, plugin_args=None, updatehash=False):
669668
"""
670669
if plugin is None:
671670
plugin = config.get('execution', 'plugin')
672-
if not isinstance(plugin, (basestring, string_types)):
671+
if not isinstance(plugin, string_types):
673672
runner = plugin
674673
else:
675674
name = 'nipype.pipeline.plugins'

0 commit comments

Comments
 (0)