Merge branch 'develop'

This commit is contained in:
Ruud committed 2014-10-12 16:41:56 +02:00
commit 1fb031ff40
1 file changed
+1 -1
+1 -1
View File
@@ -62,7 +62,7 @@ class CPLog(object):
if isinstance(replace_tuple, tuple): if isinstance(replace_tuple, tuple):
msg = msg % tuple([ss(x) if not isinstance(x, (int, float)) else x for x in list(replace_tuple)]) msg = msg % tuple([ss(x) if not isinstance(x, (int, float)) else x for x in list(replace_tuple)])
elif isinstance(replace_tuple, dict): elif isinstance(replace_tuple, dict):
msg = msg % dict((k, ss(v)) for k, v in replace_tuple.iteritems()) msg = msg % dict((k, ss(v) if not isinstance(v, (int, float)) else v) for k, v in replace_tuple.iteritems())
else: else:
msg = msg % ss(replace_tuple) msg = msg % ss(replace_tuple)
except Exception as e: except Exception as e: