Project

General

Profile

« Previous | Next » 

Revision 1567

xml_func.py: _units: If value can't be converted to float, wrap the ValueError in a SyntaxException

View differences:

xml_func.py
187 187
        for action, units_ in items:
188 188
            units_ = util.none_if(units_, u'')
189 189
            if action == 'default': units.set_default_units(quantity, units_)
190
            elif action == 'to': quantity = units.convert(quantity, units_)
190
            elif action == 'to':
191
                try: quantity = units.convert(quantity, units_)
192
                except ValueError, e: raise SyntaxException(e)
191 193
            else: raise SyntaxException(ValueError('Invalid action: '+action))
192 194
    except units.MissingUnitsException, e: raise SyntaxException(e)
193 195
    return units.quantity2str(quantity)

Also available in: Unified diff