Commit 93f77efc authored by David Flitney's avatar David Flitney
Browse files

Merge branch 'master' into 'master'

fix import of etsconfig

This is a fix for import etsconfig.
Since ETS 4.0 EnthoughtBase is deprecated (http://code.enthought.com/projects/enthought_base/). etsconfig moved to traits.

A try except block is used to keep supporting older installations.

I believe this fix actually breaks all dependencies with EnthoughtBase.

See merge request !1
parents 917e3188 55df6f9e
......@@ -55,7 +55,12 @@ from traitsui.api import Handler, View, Item, \
RangeEditor, EnumEditor, InstanceEditor
from traitsui.api import CustomEditor
from enthought.etsconfig.api import ETSConfig
# etsconfig moved to traits since ETS 4.0.
# If enthought is not installed try to import etsconfig from traits.
try:
from enthought.etsconfig.api import ETSConfig
except ImportError:
from traits.etsconfig.api import ETSConfig
from traitsui.menu import Action
if ETSConfig.toolkit == "wx":
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment