Skip to content

Commit 6676d22

Browse files
committed
cleaning up imports
1 parent 8b56e12 commit 6676d22

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

nipype/interfaces/base.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99
Requires Packages to be installed
1010
"""
1111
from __future__ import print_function, division, unicode_literals, absolute_import
12-
from future import standard_library
13-
standard_library.install_aliases()
1412
from builtins import range, object, open, str, bytes
1513

16-
from configparser import NoOptionError
1714
from copy import deepcopy
1815
import datetime
1916
from datetime import datetime as dt
@@ -26,7 +23,6 @@
2623
import select
2724
import subprocess as sp
2825
import sys
29-
import time
3026
from textwrap import wrap
3127
from warnings import warn
3228
import simplejson as json
@@ -44,6 +40,9 @@
4440
File, Directory, DictStrStr, has_metadata, ImageFile)
4541
from ..external.due import due
4642

43+
from future import standard_library
44+
standard_library.install_aliases()
45+
4746
nipype_version = Version(__version__)
4847
iflogger = logging.getLogger('interface')
4948

@@ -55,11 +54,6 @@
5554
__docformat__ = 'restructuredtext'
5655

5756

58-
class Str(traits.Unicode):
59-
"""Replacement for the default traits.Str based in bytes"""
60-
61-
traits.Str = Str
62-
6357

6458
class NipypeInterfaceError(Exception):
6559
"""Custom error for interfaces"""

nipype/interfaces/traits_extension.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,30 @@
1818
"""
1919
from __future__ import print_function, division, unicode_literals, absolute_import
2020

21-
from builtins import filter, object, str, bytes
21+
from builtins import str, bytes
2222
import os
2323

2424
# perform all external trait imports here
25-
import traits
26-
if traits.__version__ < '3.7.0':
27-
raise ImportError('Traits version 3.7.0 or higher must be installed')
25+
from traits import __version__ as traits_version
2826
import traits.api as traits
2927
from traits.trait_handlers import TraitDictObject, TraitListObject
3028
from traits.trait_errors import TraitError
3129
from traits.trait_base import _Undefined, class_of
3230

3331
from traits.api import BaseUnicode
3432
from traits.api import Unicode
33+
if traits_version < '3.7.0':
34+
raise ImportError('Traits version 3.7.0 or higher must be installed')
3535

3636
DictStrStr = traits.Dict((bytes, str), (bytes, str))
37-
Str = Unicode
37+
38+
39+
class Str(traits.Unicode):
40+
"""Replacement for the default traits.Str based in bytes"""
41+
42+
43+
traits.Str = Str
44+
3845

3946
class BaseFile(BaseUnicode):
4047
""" Defines a trait whose value must be the name of a file.

0 commit comments

Comments
 (0)