From: Zbigniew Jędrzejewski-S. <zb...@in...> - 2014-04-01 21:10:14
|
--- python/moose/neuroml2/generated_neuroml.py | 148 +++++++++---------- python/moose/neuroml2/reader.py | 2 +- python/moose/neuroml2/units.py | 2 +- .../moose/xmls_to_network/core/neuroml2_parser.py | 158 ++++++++++----------- .../moose/xmls_to_network/core/neuroml_to_moose.py | 2 +- python/moose/xmls_to_network/parser/nml_parser.py | 158 ++++++++++----------- 6 files changed, 235 insertions(+), 235 deletions(-) diff --git a/python/moose/neuroml2/generated_neuroml.py b/python/moose/neuroml2/generated_neuroml.py index f03fa42..0ea0243 100644 --- a/python/moose/neuroml2/generated_neuroml.py +++ b/python/moose/neuroml2/generated_neuroml.py @@ -76,7 +76,7 @@ def parsexml_(*args, **kwargs): try: from generatedssuper import GeneratedsSuper -except ImportError, exp: +except ImportError as exp: class GeneratedsSuper(object): tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$') @@ -1265,7 +1265,7 @@ class HHVariable(GeneratedsSuper): already_processed.add('rate') try: self.rate = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (rate): %s' % exp) value = find_attr_value_('scale', node) if value is not None and 'scale' not in already_processed: @@ -1688,7 +1688,7 @@ class PlasticityMechanism(GeneratedsSuper): already_processed.add('initReleaseProb') try: self.initReleaseProb = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (initReleaseProb): %s' % exp) self.validate_ZeroToOne(self.initReleaseProb) # validate type ZeroToOne def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): @@ -1779,7 +1779,7 @@ class SegmentParent(GeneratedsSuper): already_processed.add('fractionAlong') try: self.fractionAlong = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (fractionAlong): %s' % exp) self.validate_ZeroToOne(self.fractionAlong) # validate type ZeroToOne value = find_attr_value_('segment', node) @@ -1787,7 +1787,7 @@ class SegmentParent(GeneratedsSuper): already_processed.add('segment') try: self.segment = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.segment < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -1895,28 +1895,28 @@ class Point3DWithDiam(GeneratedsSuper): already_processed.add('y') try: self.y = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (y): %s' % exp) value = find_attr_value_('x', node) if value is not None and 'x' not in already_processed: already_processed.add('x') try: self.x = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (x): %s' % exp) value = find_attr_value_('z', node) if value is not None and 'z' not in already_processed: already_processed.add('z') try: self.z = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (z): %s' % exp) value = find_attr_value_('diameter', node) if value is not None and 'diameter' not in already_processed: already_processed.add('diameter') try: self.diameter = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (diameter): %s' % exp) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): pass @@ -1990,7 +1990,7 @@ class ProximalDetails(GeneratedsSuper): already_processed.add('translationStart') try: self.translationStart = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (translationStart): %s' % exp) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): pass @@ -2064,7 +2064,7 @@ class DistalDetails(GeneratedsSuper): already_processed.add('normalizationEnd') try: self.normalizationEnd = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (normalizationEnd): %s' % exp) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): pass @@ -2141,7 +2141,7 @@ class Member(GeneratedsSuper): already_processed.add('segment') try: self.segment = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.segment < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -2480,7 +2480,7 @@ class SegmentEndPoint(GeneratedsSuper): already_processed.add('segment') try: self.segment = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.segment < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -3583,42 +3583,42 @@ class SpaceStructure(GeneratedsSuper): already_processed.add('ySpacing') try: self.ySpacing = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (ySpacing): %s' % exp) value = find_attr_value_('zStart', node) if value is not None and 'zStart' not in already_processed: already_processed.add('zStart') try: self.zStart = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (zStart): %s' % exp) value = find_attr_value_('yStart', node) if value is not None and 'yStart' not in already_processed: already_processed.add('yStart') try: self.yStart = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (yStart): %s' % exp) value = find_attr_value_('zSpacing', node) if value is not None and 'zSpacing' not in already_processed: already_processed.add('zSpacing') try: self.zSpacing = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (zSpacing): %s' % exp) value = find_attr_value_('xStart', node) if value is not None and 'xStart' not in already_processed: already_processed.add('xStart') try: self.xStart = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (xStart): %s' % exp) value = find_attr_value_('xSpacing', node) if value is not None and 'xSpacing' not in already_processed: already_processed.add('xSpacing') try: self.xSpacing = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (xSpacing): %s' % exp) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): pass @@ -3815,7 +3815,7 @@ class UnstructuredLayout(GeneratedsSuper): already_processed.add('number') try: self.number = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.number < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -3909,7 +3909,7 @@ class RandomLayout(GeneratedsSuper): already_processed.add('number') try: self.number = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.number < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4005,7 +4005,7 @@ class GridLayout(GeneratedsSuper): already_processed.add('zSize') try: self.zSize = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.zSize < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4014,7 +4014,7 @@ class GridLayout(GeneratedsSuper): already_processed.add('ySize') try: self.ySize = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.ySize < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4023,7 +4023,7 @@ class GridLayout(GeneratedsSuper): already_processed.add('xSize') try: self.xSize = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.xSize < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4142,7 +4142,7 @@ class Instance(GeneratedsSuper): already_processed.add('i') try: self.i = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.i < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4151,7 +4151,7 @@ class Instance(GeneratedsSuper): already_processed.add('k') try: self.k = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.k < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4160,7 +4160,7 @@ class Instance(GeneratedsSuper): already_processed.add('j') try: self.j = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.j < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4169,7 +4169,7 @@ class Instance(GeneratedsSuper): already_processed.add('id') try: self.id = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.id < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4268,21 +4268,21 @@ class Location(GeneratedsSuper): already_processed.add('y') try: self.y = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (y): %s' % exp) value = find_attr_value_('x', node) if value is not None and 'x' not in already_processed: already_processed.add('x') try: self.x = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (x): %s' % exp) value = find_attr_value_('z', node) if value is not None and 'z' not in already_processed: already_processed.add('z') try: self.z = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (z): %s' % exp) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): pass @@ -4483,7 +4483,7 @@ class Connection(GeneratedsSuper): already_processed.add('id') try: self.id = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.id < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4694,7 +4694,7 @@ class Input(GeneratedsSuper): already_processed.add('id') try: self.id = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.id < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -5629,7 +5629,7 @@ class Population(Standalone): already_processed.add('size') try: self.size = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) super(Population, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): @@ -7716,7 +7716,7 @@ class ChannelPopulation(Base): already_processed.add('number') try: self.number = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.number < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -8877,7 +8877,7 @@ class GateHHRatesInf(Base): already_processed.add('instances') try: self.instances = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) value = find_attr_value_('type', node) if value is not None and 'type' not in already_processed: @@ -9059,7 +9059,7 @@ class GateHHRatesTau(Base): already_processed.add('instances') try: self.instances = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) value = find_attr_value_('type', node) if value is not None and 'type' not in already_processed: @@ -9229,7 +9229,7 @@ class GateHHTauInf(Base): already_processed.add('instances') try: self.instances = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) value = find_attr_value_('type', node) if value is not None and 'type' not in already_processed: @@ -9395,7 +9395,7 @@ class GateHHRates(Base): already_processed.add('instances') try: self.instances = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) value = find_attr_value_('type', node) if value is not None and 'type' not in already_processed: @@ -9585,7 +9585,7 @@ class GateHHUndetermined(Base): already_processed.add('instances') try: self.instances = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) value = find_attr_value_('type', node) if value is not None and 'type' not in already_processed: @@ -11104,7 +11104,7 @@ class BasePynnSynapse(BaseSynapse): already_processed.add('tau_syn') try: self.tau_syn = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_syn): %s' % exp) value = find_attr_value_('xsi:type', node) if value is not None and 'xsi:type' not in already_processed: @@ -11234,35 +11234,35 @@ class basePyNNCell(BaseCell): already_processed.add('tau_syn_I') try: self.tau_syn_I = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_syn_I): %s' % exp) value = find_attr_value_('tau_syn_E', node) if value is not None and 'tau_syn_E' not in already_processed: already_processed.add('tau_syn_E') try: self.tau_syn_E = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_syn_E): %s' % exp) value = find_attr_value_('i_offset', node) if value is not None and 'i_offset' not in already_processed: already_processed.add('i_offset') try: self.i_offset = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (i_offset): %s' % exp) value = find_attr_value_('cm', node) if value is not None and 'cm' not in already_processed: already_processed.add('cm') try: self.cm = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (cm): %s' % exp) value = find_attr_value_('v_init', node) if value is not None and 'v_init' not in already_processed: already_processed.add('v_init') try: self.v_init = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_init): %s' % exp) value = find_attr_value_('xsi:type', node) if value is not None and 'xsi:type' not in already_processed: @@ -12485,7 +12485,7 @@ class AlphaCondSynapse(BasePynnSynapse): already_processed.add('e_rev') try: self.e_rev = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev): %s' % exp) super(AlphaCondSynapse, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): @@ -12565,7 +12565,7 @@ class ExpCondSynapse(BasePynnSynapse): already_processed.add('e_rev') try: self.e_rev = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev): %s' % exp) super(ExpCondSynapse, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): @@ -12725,63 +12725,63 @@ class HH_cond_exp(basePyNNCell): already_processed.add('gbar_K') try: self.gbar_K = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (gbar_K): %s' % exp) value = find_attr_value_('e_rev_E', node) if value is not None and 'e_rev_E' not in already_processed: already_processed.add('e_rev_E') try: self.e_rev_E = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_E): %s' % exp) value = find_attr_value_('g_leak', node) if value is not None and 'g_leak' not in already_processed: already_processed.add('g_leak') try: self.g_leak = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (g_leak): %s' % exp) value = find_attr_value_('e_rev_Na', node) if value is not None and 'e_rev_Na' not in already_processed: already_processed.add('e_rev_Na') try: self.e_rev_Na = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_Na): %s' % exp) value = find_attr_value_('e_rev_I', node) if value is not None and 'e_rev_I' not in already_processed: already_processed.add('e_rev_I') try: self.e_rev_I = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_I): %s' % exp) value = find_attr_value_('e_rev_K', node) if value is not None and 'e_rev_K' not in already_processed: already_processed.add('e_rev_K') try: self.e_rev_K = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_K): %s' % exp) value = find_attr_value_('e_rev_leak', node) if value is not None and 'e_rev_leak' not in already_processed: already_processed.add('e_rev_leak') try: self.e_rev_leak = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_leak): %s' % exp) value = find_attr_value_('v_offset', node) if value is not None and 'v_offset' not in already_processed: already_processed.add('v_offset') try: self.v_offset = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_offset): %s' % exp) value = find_attr_value_('gbar_Na', node) if value is not None and 'gbar_Na' not in already_processed: already_processed.add('gbar_Na') try: self.gbar_Na = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (gbar_Na): %s' % exp) super(HH_cond_exp, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): @@ -12907,35 +12907,35 @@ class basePyNNIaFCell(basePyNNCell): already_processed.add('tau_refrac') try: self.tau_refrac = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_refrac): %s' % exp) value = find_attr_value_('v_thresh', node) if value is not None and 'v_thresh' not in already_processed: already_processed.add('v_thresh') try: self.v_thresh = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_thresh): %s' % exp) value = find_attr_value_('tau_m', node) if value is not None and 'tau_m' not in already_processed: already_processed.add('tau_m') try: self.tau_m = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_m): %s' % exp) value = find_attr_value_('v_reset', node) if value is not None and 'v_reset' not in already_processed: already_processed.add('v_reset') try: self.v_reset = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_reset): %s' % exp) value = find_attr_value_('v_rest', node) if value is not None and 'v_rest' not in already_processed: already_processed.add('v_rest') try: self.v_rest = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_rest): %s' % exp) value = find_attr_value_('xsi:type', node) if value is not None and 'xsi:type' not in already_processed: @@ -13510,14 +13510,14 @@ class basePyNNIaFCondCell(basePyNNIaFCell): already_processed.add('e_rev_I') try: self.e_rev_I = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_I): %s' % exp) value = find_attr_value_('e_rev_E', node) if value is not None and 'e_rev_E' not in already_processed: already_processed.add('e_rev_E') try: self.e_rev_E = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_E): %s' % exp) value = find_attr_value_('xsi:type', node) if value is not None and 'xsi:type' not in already_processed: @@ -13738,35 +13738,35 @@ class EIF_cond_alpha_isfa_ista(basePyNNIaFCondCell): already_processed.add('a') try: self.a = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (a): %s' % exp) value = find_attr_value_('delta_T', node) if value is not None and 'delta_T' not in already_processed: already_processed.add('delta_T') try: self.delta_T = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (delta_T): %s' % exp) value = find_attr_value_('b', node) if value is not None and 'b' not in already_processed: already_processed.add('b') try: self.b = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (b): %s' % exp) value = find_attr_value_('v_spike', node) if value is not None and 'v_spike' not in already_processed: already_processed.add('v_spike') try: self.v_spike = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_spike): %s' % exp) value = find_attr_value_('tau_w', node) if value is not None and 'tau_w' not in already_processed: already_processed.add('tau_w') try: self.tau_w = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_w): %s' % exp) super(EIF_cond_alpha_isfa_ista, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): @@ -13886,35 +13886,35 @@ class EIF_cond_exp_isfa_ista(basePyNNIaFCondCell): already_processed.add('a') try: self.a = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (a): %s' % exp) value = find_attr_value_('delta_T', node) if value is not None and 'delta_T' not in already_processed: already_processed.add('delta_T') try: self.delta_T = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (delta_T): %s' % exp) value = find_attr_value_('b', node) if value is not None and 'b' not in already_processed: already_processed.add('b') try: self.b = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (b): %s' % exp) value = find_attr_value_('v_spike', node) if value is not None and 'v_spike' not in already_processed: already_processed.add('v_spike') try: self.v_spike = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_spike): %s' % exp) value = find_attr_value_('tau_w', node) if value is not None and 'tau_w' not in already_processed: already_processed.add('tau_w') try: self.tau_w = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_w): %s' % exp) super(EIF_cond_exp_isfa_ista, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): diff --git a/python/moose/neuroml2/reader.py b/python/moose/neuroml2/reader.py index 28d7d5e..ee20af4 100644 --- a/python/moose/neuroml2/reader.py +++ b/python/moose/neuroml2/reader.py @@ -343,7 +343,7 @@ class NML2Reader(object): for path in paths: try: inner.read(path) - except IOError, e: + except IOError as e: error = e else: self.includes[include.href] = inner diff --git a/python/moose/neuroml2/units.py b/python/moose/neuroml2/units.py index cd89edf..2b23342 100644 --- a/python/moose/neuroml2/units.py +++ b/python/moose/neuroml2/units.py @@ -67,7 +67,7 @@ magnitude_regex = re.compile(r'^[\+-]?\d*\.?\d*([eE][\+-]?\d+)?') def SI(expression): try: match = magnitude_regex.match(expression) - except Exception, e: + except Exception as e: print('Error %s with expression: %s' % (e, expression)) raise(e) magnitude = float(match.group(0)) diff --git a/python/moose/xmls_to_network/core/neuroml2_parser.py b/python/moose/xmls_to_network/core/neuroml2_parser.py index 2b880d9..89fa1de 100644 --- a/python/moose/xmls_to_network/core/neuroml2_parser.py +++ b/python/moose/xmls_to_network/core/neuroml2_parser.py @@ -76,7 +76,7 @@ def parsexml_(*args, **kwargs): try: from generatedssuper import GeneratedsSuper -except ImportError, exp: +except ImportError as exp: class GeneratedsSuper(object): tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$') @@ -1266,7 +1266,7 @@ class HHVariable(GeneratedsSuper): already_processed.add('rate') try: self.rate = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (rate): %s' % exp) value = find_attr_value_('scale', node) if value is not None and 'scale' not in already_processed: @@ -1689,7 +1689,7 @@ class PlasticityMechanism(GeneratedsSuper): already_processed.add('initReleaseProb') try: self.initReleaseProb = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (initReleaseProb): %s' % exp) self.validate_ZeroToOne(self.initReleaseProb) # validate type ZeroToOne def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): @@ -1780,7 +1780,7 @@ class SegmentParent(GeneratedsSuper): already_processed.add('fractionAlong') try: self.fractionAlong = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (fractionAlong): %s' % exp) self.validate_ZeroToOne(self.fractionAlong) # validate type ZeroToOne value = find_attr_value_('segment', node) @@ -1788,7 +1788,7 @@ class SegmentParent(GeneratedsSuper): already_processed.add('segment') try: self.segment = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.segment < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -1896,28 +1896,28 @@ class Point3DWithDiam(GeneratedsSuper): already_processed.add('y') try: self.y = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (y): %s' % exp) value = find_attr_value_('x', node) if value is not None and 'x' not in already_processed: already_processed.add('x') try: self.x = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (x): %s' % exp) value = find_attr_value_('z', node) if value is not None and 'z' not in already_processed: already_processed.add('z') try: self.z = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (z): %s' % exp) value = find_attr_value_('diameter', node) if value is not None and 'diameter' not in already_processed: already_processed.add('diameter') try: self.diameter = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (diameter): %s' % exp) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): pass @@ -1991,7 +1991,7 @@ class ProximalDetails(GeneratedsSuper): already_processed.add('translationStart') try: self.translationStart = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (translationStart): %s' % exp) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): pass @@ -2065,7 +2065,7 @@ class DistalDetails(GeneratedsSuper): already_processed.add('normalizationEnd') try: self.normalizationEnd = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (normalizationEnd): %s' % exp) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): pass @@ -2142,7 +2142,7 @@ class Member(GeneratedsSuper): already_processed.add('segment') try: self.segment = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.segment < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -2481,7 +2481,7 @@ class SegmentEndPoint(GeneratedsSuper): already_processed.add('segment') try: self.segment = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.segment < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -3596,42 +3596,42 @@ class SpaceStructure(GeneratedsSuper): already_processed.add('ySpacing') try: self.ySpacing = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (ySpacing): %s' % exp) value = find_attr_value_('zStart', node) if value is not None and 'zStart' not in already_processed: already_processed.add('zStart') try: self.zStart = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (zStart): %s' % exp) value = find_attr_value_('yStart', node) if value is not None and 'yStart' not in already_processed: already_processed.add('yStart') try: self.yStart = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (yStart): %s' % exp) value = find_attr_value_('zSpacing', node) if value is not None and 'zSpacing' not in already_processed: already_processed.add('zSpacing') try: self.zSpacing = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (zSpacing): %s' % exp) value = find_attr_value_('xStart', node) if value is not None and 'xStart' not in already_processed: already_processed.add('xStart') try: self.xStart = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (xStart): %s' % exp) value = find_attr_value_('xSpacing', node) if value is not None and 'xSpacing' not in already_processed: already_processed.add('xSpacing') try: self.xSpacing = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (xSpacing): %s' % exp) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): pass @@ -3828,7 +3828,7 @@ class UnstructuredLayout(GeneratedsSuper): already_processed.add('number') try: self.number = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.number < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -3922,7 +3922,7 @@ class RandomLayout(GeneratedsSuper): already_processed.add('number') try: self.number = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.number < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4018,7 +4018,7 @@ class GridLayout(GeneratedsSuper): already_processed.add('zSize') try: self.zSize = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.zSize < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4027,7 +4027,7 @@ class GridLayout(GeneratedsSuper): already_processed.add('ySize') try: self.ySize = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.ySize < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4036,7 +4036,7 @@ class GridLayout(GeneratedsSuper): already_processed.add('xSize') try: self.xSize = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.xSize < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4155,7 +4155,7 @@ class Instance(GeneratedsSuper): already_processed.add('i') try: self.i = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.i < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4164,7 +4164,7 @@ class Instance(GeneratedsSuper): already_processed.add('k') try: self.k = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.k < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4173,7 +4173,7 @@ class Instance(GeneratedsSuper): already_processed.add('j') try: self.j = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.j < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4182,7 +4182,7 @@ class Instance(GeneratedsSuper): already_processed.add('id') try: self.id = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.id < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4281,21 +4281,21 @@ class Location(GeneratedsSuper): already_processed.add('y') try: self.y = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (y): %s' % exp) value = find_attr_value_('x', node) if value is not None and 'x' not in already_processed: already_processed.add('x') try: self.x = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (x): %s' % exp) value = find_attr_value_('z', node) if value is not None and 'z' not in already_processed: already_processed.add('z') try: self.z = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (z): %s' % exp) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): pass @@ -4538,7 +4538,7 @@ class Connection(GeneratedsSuper): already_processed.add('preFractionAlong') try: self.preFractionAlong = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (preFractionAlong): %s' % exp) self.validate_ZeroToOne(self.preFractionAlong) # validate type ZeroToOne value = find_attr_value_('preCellId', node) @@ -4550,7 +4550,7 @@ class Connection(GeneratedsSuper): already_processed.add('postFractionAlong') try: self.postFractionAlong = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (postFractionAlong): %s' % exp) self.validate_ZeroToOne(self.postFractionAlong) # validate type ZeroToOne value = find_attr_value_('postSegmentId', node) @@ -4558,7 +4558,7 @@ class Connection(GeneratedsSuper): already_processed.add('postSegmentId') try: self.postSegmentId = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.postSegmentId < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4572,7 +4572,7 @@ class Connection(GeneratedsSuper): already_processed.add('preSegmentId') try: self.preSegmentId = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.preSegmentId < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4582,7 +4582,7 @@ class Connection(GeneratedsSuper): already_processed.add('id') try: self.id = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.id < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -4789,7 +4789,7 @@ class Input(GeneratedsSuper): already_processed.add('id') try: self.id = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.id < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -5787,7 +5787,7 @@ class Population(Standalone): already_processed.add('size') try: self.size = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) super(Population, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): @@ -8043,7 +8043,7 @@ class ChannelPopulation(Base): already_processed.add('number') try: self.number = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.number < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -8639,7 +8639,7 @@ class Segment(BaseWithoutId): already_processed.add('id') try: self.id = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) if self.id < 0: raise_parse_error(node, 'Invalid NonNegativeInteger') @@ -9227,7 +9227,7 @@ class GateHHRatesInf(Base): already_processed.add('instances') try: self.instances = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) value = find_attr_value_('type', node) if value is not None and 'type' not in already_processed: @@ -9412,7 +9412,7 @@ class GateHHRatesTau(Base): already_processed.add('instances') try: self.instances = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) value = find_attr_value_('type', node) if value is not None and 'type' not in already_processed: @@ -9582,7 +9582,7 @@ class GateHHTauInf(Base): already_processed.add('instances') try: self.instances = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) value = find_attr_value_('type', node) if value is not None and 'type' not in already_processed: @@ -9748,7 +9748,7 @@ class GateHHRates(Base): already_processed.add('instances') try: self.instances = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) value = find_attr_value_('type', node) if value is not None and 'type' not in already_processed: @@ -9938,7 +9938,7 @@ class GateHHUndetermined(Base): already_processed.add('instances') try: self.instances = int(value) - except ValueError, exp: + except ValueError as exp: raise_parse_error(node, 'Bad integer attribute: %s' % exp) value = find_attr_value_('type', node) if value is not None and 'type' not in already_processed: @@ -11457,7 +11457,7 @@ class BasePynnSynapse(BaseSynapse): already_processed.add('tau_syn') try: self.tau_syn = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_syn): %s' % exp) value = find_attr_value_('xsi:type', node) if value is not None and 'xsi:type' not in already_processed: @@ -11587,35 +11587,35 @@ class basePyNNCell(BaseCell): already_processed.add('tau_syn_I') try: self.tau_syn_I = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_syn_I): %s' % exp) value = find_attr_value_('tau_syn_E', node) if value is not None and 'tau_syn_E' not in already_processed: already_processed.add('tau_syn_E') try: self.tau_syn_E = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_syn_E): %s' % exp) value = find_attr_value_('i_offset', node) if value is not None and 'i_offset' not in already_processed: already_processed.add('i_offset') try: self.i_offset = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (i_offset): %s' % exp) value = find_attr_value_('cm', node) if value is not None and 'cm' not in already_processed: already_processed.add('cm') try: self.cm = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (cm): %s' % exp) value = find_attr_value_('v_init', node) if value is not None and 'v_init' not in already_processed: already_processed.add('v_init') try: self.v_init = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_init): %s' % exp) value = find_attr_value_('xsi:type', node) if value is not None and 'xsi:type' not in already_processed: @@ -12838,7 +12838,7 @@ class AlphaCondSynapse(BasePynnSynapse): already_processed.add('e_rev') try: self.e_rev = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev): %s' % exp) super(AlphaCondSynapse, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): @@ -12918,7 +12918,7 @@ class ExpCondSynapse(BasePynnSynapse): already_processed.add('e_rev') try: self.e_rev = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev): %s' % exp) super(ExpCondSynapse, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): @@ -13078,63 +13078,63 @@ class HH_cond_exp(basePyNNCell): already_processed.add('gbar_K') try: self.gbar_K = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (gbar_K): %s' % exp) value = find_attr_value_('e_rev_E', node) if value is not None and 'e_rev_E' not in already_processed: already_processed.add('e_rev_E') try: self.e_rev_E = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_E): %s' % exp) value = find_attr_value_('g_leak', node) if value is not None and 'g_leak' not in already_processed: already_processed.add('g_leak') try: self.g_leak = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (g_leak): %s' % exp) value = find_attr_value_('e_rev_Na', node) if value is not None and 'e_rev_Na' not in already_processed: already_processed.add('e_rev_Na') try: self.e_rev_Na = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_Na): %s' % exp) value = find_attr_value_('e_rev_I', node) if value is not None and 'e_rev_I' not in already_processed: already_processed.add('e_rev_I') try: self.e_rev_I = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_I): %s' % exp) value = find_attr_value_('e_rev_K', node) if value is not None and 'e_rev_K' not in already_processed: already_processed.add('e_rev_K') try: self.e_rev_K = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_K): %s' % exp) value = find_attr_value_('e_rev_leak', node) if value is not None and 'e_rev_leak' not in already_processed: already_processed.add('e_rev_leak') try: self.e_rev_leak = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_leak): %s' % exp) value = find_attr_value_('v_offset', node) if value is not None and 'v_offset' not in already_processed: already_processed.add('v_offset') try: self.v_offset = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_offset): %s' % exp) value = find_attr_value_('gbar_Na', node) if value is not None and 'gbar_Na' not in already_processed: already_processed.add('gbar_Na') try: self.gbar_Na = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (gbar_Na): %s' % exp) super(HH_cond_exp, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): @@ -13260,35 +13260,35 @@ class basePyNNIaFCell(basePyNNCell): already_processed.add('tau_refrac') try: self.tau_refrac = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_refrac): %s' % exp) value = find_attr_value_('v_thresh', node) if value is not None and 'v_thresh' not in already_processed: already_processed.add('v_thresh') try: self.v_thresh = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_thresh): %s' % exp) value = find_attr_value_('tau_m', node) if value is not None and 'tau_m' not in already_processed: already_processed.add('tau_m') try: self.tau_m = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (tau_m): %s' % exp) value = find_attr_value_('v_reset', node) if value is not None and 'v_reset' not in already_processed: already_processed.add('v_reset') try: self.v_reset = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_reset): %s' % exp) value = find_attr_value_('v_rest', node) if value is not None and 'v_rest' not in already_processed: already_processed.add('v_rest') try: self.v_rest = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (v_rest): %s' % exp) value = find_attr_value_('xsi:type', node) if value is not None and 'xsi:type' not in already_processed: @@ -13863,14 +13863,14 @@ class basePyNNIaFCondCell(basePyNNIaFCell): already_processed.add('e_rev_I') try: self.e_rev_I = float(value) - except ValueError, exp: + except ValueError as exp: raise ValueError('Bad float/double attribute (e_rev_I): %s' % exp) value = find_attr_value_('e_rev_E', node) if value is not None and 'e_rev_E' not in already_processed: already_processed.add('e_rev_E') try: self.e_rev_E = float(value) - e... [truncated message content] |