aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmproxy/utils.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/libmproxy/utils.py b/libmproxy/utils.py
index 5f0b833d..6568c445 100644
--- a/libmproxy/utils.py
+++ b/libmproxy/utils.py
@@ -16,14 +16,15 @@ import re, os, subprocess, datetime, textwrap, errno, sys, time, pytz
def timestamp():
- d = datetime.datetime.utcnow()
- return list(d.timetuple())
+ """
+ Returns a serializable UTC timestamp.
+ """
+ return time.time()
def format_timestamp(s):
- s = time.struct_time(s)
+ s = time.localtime(s)
d = datetime.datetime.fromtimestamp(time.mktime(s))
- d = d - datetime.timedelta(seconds=time.altzone)
return d.strftime("%Y-%m-%d %H:%M:%S")