Skip to content

Commit e54f3e2

Browse files
committed
force setting ETS_TOOLKIT before tvtk #972
1 parent 0bd9649 commit e54f3e2

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

nipype/algorithms/mesh.py

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,26 @@
1111
1212
'''
1313

14-
1514
import numpy as np
1615
from numpy import linalg as nla
1716
import os.path as op
1817
from ..external import six
19-
2018
from .. import logging
21-
2219
from ..interfaces.base import (BaseInterface, traits, TraitedSpec, File,
2320
BaseInterfaceInputSpec)
2421
from warnings import warn
2522

26-
2723
have_tvtk = False
28-
2924
try:
25+
import os
26+
os.environ['ETS_TOOLKIT'] = 'null'
3027
from tvtk.api import tvtk
3128
have_tvtk = True
3229
except ImportError:
33-
raise ImportError('Interface requires tvtk')
34-
35-
try:
36-
from enthought.etsconfig.api import ETSConfig
37-
ETSConfig.toolkit = 'null'
38-
except ImportError:
39-
iflogger.warn(('ETS toolkit could not be imported'))
40-
except ValueError:
41-
iflogger.warn(('ETS toolkit could not be set to null'))
30+
pass
4231

4332
if have_tvtk:
44-
tvtk.tvtk_classes.vtk_version import vtk_build_version
33+
from tvtk.tvtk_classes.vtk_version import vtk_build_version
4534
vtk_major = int(vtk_build_version[0])
4635

4736
iflogger = logging.getLogger('interface')

0 commit comments

Comments
 (0)