diff --git a/moose-core/AUTHORS b/moose-core/AUTHORS index 565695af709d18d0db50b9bd0e1662ddcd5e30aa..9881154c6c6599718501ccc240653881aff4d44f 100644 --- a/moose-core/AUTHORS +++ b/moose-core/AUTHORS @@ -1,17 +1,17 @@ -# Active developers - -Upinder S. Bhalla Primary Architect, rdesigneur -HarshaRani. G.V MOOSE Website, SBML support, GUI -Dilawar Singh Multithreading, GSoC, Packaging, Maintenance, BOOST solvers - -# Past developers - -Subhasis Ray Python interface, GUI -Niraj Dudani Neuronal solver -Aditya Gilra NeuroML support -Aviral Goel Moogli - -# Contributors - -Padraid Gleeson NeuroML2 support -Dharma Teja GPU parallelization using CUDA +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g +ElementTree/ElementTree/g diff --git a/moose-core/python/moose/neuroml/ChannelML.py b/moose-core/python/moose/neuroml/ChannelML.py index d658bddf5b27578572d1a2de35bb89a4d1f87e37..60a566fdfb7fa6edd5b51dbb6d10e20081d6117a 100644 --- a/moose-core/python/moose/neuroml/ChannelML.py +++ b/moose-core/python/moose/neuroml/ChannelML.py @@ -14,7 +14,7 @@ readChannelML(...) / readSynapseML to load from an xml.etree xml element (could """ from __future__ import print_function -from xml.etree import cElementTree as ET +from xml.etree import ElementTree as ET import string import os, sys import math diff --git a/moose-core/python/moose/neuroml/MorphML.py b/moose-core/python/moose/neuroml/MorphML.py index b89f76e9aa99f696327794f01c74f691cd9ff84c..0a5d0c156a25fc7977a6fa584f15797589130431 100644 --- a/moose-core/python/moose/neuroml/MorphML.py +++ b/moose-core/python/moose/neuroml/MorphML.py @@ -16,7 +16,7 @@ have already been loaded under that same name in /library in MOOSE (use ChannelM """ from __future__ import print_function -from xml.etree import cElementTree as ET # cELementTree is mostly API-compatible but faster than ElementTree +from xml.etree import ElementTree as ET # cELementTree is mostly API-compatible but faster than ElementTree import string import sys import math diff --git a/moose-core/python/moose/neuroml/NetworkML.py b/moose-core/python/moose/neuroml/NetworkML.py index b400ce23088f3d56ade2ff155f1490289422ab2a..d7f30692eb11115bf00e9d2fdd59d760b16c7e8b 100644 --- a/moose-core/python/moose/neuroml/NetworkML.py +++ b/moose-core/python/moose/neuroml/NetworkML.py @@ -14,7 +14,7 @@ readNetworkML(...) to load from an xml.etree xml element (could be part of a lar """ from __future__ import print_function -from xml.etree import cElementTree as ET +from xml.etree import ElementTree as ET import string import os from math import cos, sin diff --git a/moose-core/python/moose/neuroml/NeuroML.py b/moose-core/python/moose/neuroml/NeuroML.py index e558f443002774ff2704b282a65f552871738574..ceddf21d811b33e77f2828a269a3942b15c65085 100644 --- a/moose-core/python/moose/neuroml/NeuroML.py +++ b/moose-core/python/moose/neuroml/NeuroML.py @@ -47,7 +47,7 @@ In [3]: moose.neuroml.loadNeuroML_L123('Generated.net.xml') from __future__ import print_function import moose from moose.utils import * -from xml.etree import cElementTree as ET +from xml.etree import ElementTree as ET from moose.neuroml.ChannelML import ChannelML from moose.neuroml.MorphML import MorphML from moose.neuroml.NetworkML import NetworkML diff --git a/moose-core/python/moose/neuroml/utils.py b/moose-core/python/moose/neuroml/utils.py index 95d3569407853140983a290fb5b755ad41079870..5c792c08eef49fe46d8c13b19feb6fe42ec796f9 100644 --- a/moose-core/python/moose/neuroml/utils.py +++ b/moose-core/python/moose/neuroml/utils.py @@ -13,7 +13,7 @@ indent(...) is an in-place prettyprint formatter copied from http://effbot.org/z """ from __future__ import print_function -from xml.etree import cElementTree as ET +from xml.etree import ElementTree as ET from xml.etree import ElementTree as slowET import math import os @@ -40,10 +40,10 @@ slowET._namespace_map[cml_ns] = 'cml' slowET._namespace_map[meta_ns] = 'meta' slowET._namespace_map[xsi_ns] = 'xsi' -### cElementTree is much faster than ElementTree and is API compatible with the latter, +### ElementTree is much faster than ElementTree and is API compatible with the latter, ### but instead of _namespace_map above, use register_namespace below ... ### but this works only with python2.7 onwards, so stick to above, -### with import elementtree.ElementTree alongwith importing cElementTree as at +### with import elementtree.ElementTree alongwith importing ElementTree as at ### http://dev.blogs.nuxeo.com/2006/02/elementtree-serialization-namespace-prefixes.html #ET.register_namespace('neuroml',neuroml_ns) #ET.register_namespace('nml',nml_ns) diff --git a/moose-core/python/rdesigneur/rdesigneur.py b/moose-core/python/rdesigneur/rdesigneur.py index aa5b3fce4b5513a3579fae9e365687e7f24c6ce3..ba1515fc8713ed22c629c4c1b2aed0946263b34c 100644 --- a/moose-core/python/rdesigneur/rdesigneur.py +++ b/moose-core/python/rdesigneur/rdesigneur.py @@ -39,7 +39,7 @@ from moose.fixXreacs import fixXreacs from moose.neuroml.NeuroML import NeuroML from moose.neuroml.ChannelML import ChannelML -# In python3, cElementTree is deprecated. We do not plan to support python <2.7 +# In python3, ElementTree is deprecated. We do not plan to support python <2.7 # in future, so other imports have been removed. try: from lxml import etree