aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/utils.py
diff options
context:
space:
mode:
authorTarashish Mishra <sunu0000@gmail.com>2015-03-04 22:32:01 +0530
committerTarashish Mishra <sunu0000@gmail.com>2015-03-04 22:32:01 +0530
commit48023db59e048da20484ca631d41aa524425f5dd (patch)
treef2f4c81075554fc2b05ca3ea10c02b8b33154c75 /libmproxy/utils.py
parentb49d573c8ba2aac2f2ec9082c9982cc097a094b9 (diff)
downloadmitmproxy-48023db59e048da20484ca631d41aa524425f5dd.tar.gz
mitmproxy-48023db59e048da20484ca631d41aa524425f5dd.tar.bz2
mitmproxy-48023db59e048da20484ca631d41aa524425f5dd.zip
Minor refactor to PR #496
Diffstat (limited to 'libmproxy/utils.py')
-rw-r--r--libmproxy/utils.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/libmproxy/utils.py b/libmproxy/utils.py
index e2306c11..51f2dc26 100644
--- a/libmproxy/utils.py
+++ b/libmproxy/utils.py
@@ -15,10 +15,12 @@ def format_timestamp(s):
d = datetime.datetime.fromtimestamp(time.mktime(s))
return d.strftime("%Y-%m-%d %H:%M:%S")
+
def format_timestamp_with_milli(s):
d = datetime.datetime.fromtimestamp(s)
- return d.strftime("%Y-%m-%d %H:%M:%S.")+str(d.microsecond/1000).zfill(3)
-
+ return d.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3]
+
+
def isBin(s):
"""
Does this string have any non-ASCII characters?
@@ -84,15 +86,15 @@ def pretty_size(size):
def pretty_duration(secs):
formatters = [
- (100, "{:.0f}s"),
- (10, "{:2.1f}s"),
- (1, "{:1.2f}s"),
+ (100, "{:.0f}s"),
+ (10, "{:2.1f}s"),
+ (1, "{:1.2f}s"),
]
for limit, formatter in formatters:
if secs >= limit:
return formatter.format(secs)
- #less than 1 sec
+ #less than 1 sec
return "{:.0f}ms".format(secs*1000)
class Data: