From d06b8478e8b66b748787eac16f633f04b5e7dec1 Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Thu, 30 Jan 2020 14:59:21 -0500 Subject: [PATCH] FIX: Move TraitType import, handle API change for NoDefaultSpecified --- nipype/interfaces/base/traits_extension.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nipype/interfaces/base/traits_extension.py b/nipype/interfaces/base/traits_extension.py index 0ffab07a03..cbfe24e676 100644 --- a/nipype/interfaces/base/traits_extension.py +++ b/nipype/interfaces/base/traits_extension.py @@ -24,10 +24,15 @@ # perform all external trait imports here from traits import __version__ as traits_version import traits.api as traits -from traits.trait_handlers import TraitType, NoDefaultSpecified +from traits.api import TraitType, Unicode from traits.trait_base import _Undefined +try: + # Moved in traits 6.0 + from traits.trait_type import NoDefaultSpecified +except ImportError: + # Pre-6.0 + from traits.trait_handlers import NoDefaultSpecified -from traits.api import Unicode from pathlib import Path from ...utils.filemanip import path_resolve