Skip to content

Commit 46c7ec7

Browse files
committed
ENH: Don't require ordereddict for python < 2.7
1 parent ff10dc7 commit 46c7ec7

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

build_docs.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
_info_fname = pjoin(os.path.dirname(__file__), 'nipype', 'info.py')
2222
INFO_VARS = {}
2323
exec(open(_info_fname, 'rt').read(), {}, INFO_VARS)
24-
if sys.version_info < (2, 7):
25-
INFO_VARS['REQUIRES'].append('ordereddict')
2624

2725
DOC_BUILD_DIR = os.path.join('doc', '_build', 'html')
2826
DOC_DOCTREES_DIR = os.path.join('doc', '_build', 'doctrees')

nipype/pipeline/plugins/base.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ def create_pyscript(node, updatehash=False, store_exception=True):
116116
pklfile = '%s'
117117
batchdir = '%s'
118118
try:
119-
if sys.version_info < (2, 7):
120-
from ordereddict import OrderedDict
121-
else:
119+
if not sys.version_info < (2, 7):
122120
from collections import OrderedDict
123121
config_dict=%s
124122
config.update_config(config_dict)

0 commit comments

Comments
 (0)