Merge remote-tracking branch 'origin/devel' into devel

This commit is contained in:
Gina Häußge 2015-02-03 10:18:31 +01:00
commit d5abf3f0f5

View file

@ -262,13 +262,16 @@ def getCodeInt(line, code):
def getCodeFloat(line, code):
import math
n = line.find(code) + 1
if n < 1:
return None
m = line.find(' ', n)
try:
if m < 0:
return float(line[n:])
return float(line[n:m])
val = float(line[n:])
else:
val = float(line[n:m])
return val if not (math.isnan(val) or math.isinf(val)) else None
except:
return None