Merge branch 'develop_seed_fixes' of git://github.com/mano3m/CouchPotatoServer into mano3m-develop_seed_fixes

2013-08-24 13:22:29 +02:00
parent e2bd6a91cd bf6bcaed72
commit bb8e8a0df5
7 changed files with 42 additions and 22 deletions
@@ -140,7 +140,11 @@ def tryInt(s):
    except: return 0

 def tryFloat(s):
-    try: return float(s) if '.' in s else tryInt(s)
+    try:
+        if isinstance(s, str):
+            return float(s) if '.' in s else tryInt(s)
+        else:
+            return float(s)
    except: return 0

 def natsortKey(s):