diff py/utils.py @ 293:d15dda1b1f76

merge
author Matt Johnston <matt@ucc.asn.au>
date Sat, 06 Jul 2019 18:29:45 +0800
parents 26eee8591f61
children 78c542f03030
line wrap: on
line diff
--- a/py/utils.py	Thu Mar 19 21:50:52 2015 +0800
+++ b/py/utils.py	Sat Jul 06 18:29:45 2019 +0800
@@ -4,6 +4,8 @@
 import time
 import select
 import logging
+import binascii
+import json
 
 D = logging.debug
 L = logging.info
@@ -60,7 +62,7 @@
                 time.sleep(try_time)
             return None
 
-        new_f.func_name = func.func_name
+        new_f.__name__ = func.__name__
         return new_f
     return inner
 
@@ -113,7 +115,7 @@
         pid = os.fork()
         if pid > 0:
             sys.exit(0)
-    except OSError, e:
+    except OSError as e:
         E("Bad fork()")
         sys.exit(1)
 
@@ -123,13 +125,16 @@
         pid = os.fork()
         if pid > 0:
             sys.exit(0)
-    except OSError, e:
+    except OSError as e:
         E("Bad fork()")
         sys.exit(1)
 
 def uptime():
     try:
         return float(open('/proc/uptime', 'r').read().split(' ', 1)[0])
-    except Exception, e:
+    except Exception as e:
         return -1
 
+
+def json_load_round_float(s, **args):
+    return json.loads(s,parse_float = lambda f: round(float(f), 2), **args)