diff --git a/moose-core/python/rdesigneur/rdesigneur.py b/moose-core/python/rdesigneur/rdesigneur.py index ba1515fc8713ed22c629c4c1b2aed0946263b34c..c29f19cb5471bd4f8c65e58c0689648e14105402 100644 --- a/moose-core/python/rdesigneur/rdesigneur.py +++ b/moose-core/python/rdesigneur/rdesigneur.py @@ -30,16 +30,11 @@ import matplotlib.pyplot as plt import rdesigneur.rmoogli as rmoogli from rdesigneur.rdesigneurProtos import * from moose.fixXreacs import fixXreacs -#import fixXreacs -#from . import fixXreacs -#from rdesigneur.rmoogli import * -#import rmoogli -#from rdesigneurProtos import * from moose.neuroml.NeuroML import NeuroML from moose.neuroml.ChannelML import ChannelML -# In python3, ElementTree is deprecated. We do not plan to support python <2.7 +# In python3, cElementTree is deprecated. We do not plan to support python <2.7 # in future, so other imports have been removed. try: from lxml import etree diff --git a/moose-core/tests/python/test_rdesigneur.py b/moose-core/tests/python/test_rdesigneur.py index 28a92636153f122ce59184b1764bee4bd59bee22..d89aa1366009404a7fbbd315742bcaede9d10085 100644 --- a/moose-core/tests/python/test_rdesigneur.py +++ b/moose-core/tests/python/test_rdesigneur.py @@ -15,8 +15,13 @@ matplotlib.use('Agg') import matplotlib.pyplot as plt import numpy as np import moose -import rdesigneur as rd +try: + import rdesigneur as rd +except RuntimeError as e: + print( "[WARN ] Could not import rdesigneur. Most likely due to DISPLAY issue." ) + quit() + def test2( ): if moose.exists( '/model' ): moose.delete( '/model' )