aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUjjwal Verma <ujjwalverma1111@gmail.com>2017-02-25 23:07:47 +0530
committerUjjwal Verma <ujjwalverma1111@gmail.com>2017-02-25 23:07:47 +0530
commite723a58af5dc4fc7a46958aa9ce8c386a7387450 (patch)
tree23b87ffa2f2e5be5b8de481741a75d6b11866894
parent2aecffd39abb41c500573d823f0a05b1f7522041 (diff)
downloadmitmproxy-e723a58af5dc4fc7a46958aa9ce8c386a7387450.tar.gz
mitmproxy-e723a58af5dc4fc7a46958aa9ce8c386a7387450.tar.bz2
mitmproxy-e723a58af5dc4fc7a46958aa9ce8c386a7387450.zip
Remove pytz in hardump
-rw-r--r--examples/complex/har_dump.py10
-rw-r--r--setup.py1
2 files changed, 3 insertions, 8 deletions
diff --git a/examples/complex/har_dump.py b/examples/complex/har_dump.py
index f7c1e658..51983b54 100644
--- a/examples/complex/har_dump.py
+++ b/examples/complex/har_dump.py
@@ -10,7 +10,7 @@ import zlib
import os
from datetime import datetime
-import pytz
+from datetime import timezone
import mitmproxy
@@ -89,7 +89,7 @@ def response(flow):
# Timings set to -1 will be ignored as per spec.
full_time = sum(v for v in timings.values() if v > -1)
- started_date_time = format_datetime(datetime.utcfromtimestamp(flow.request.timestamp_start))
+ started_date_time = datetime.fromtimestamp(flow.request.timestamp_start, timezone.utc).isoformat()
# Response body size and encoding
response_body_size = len(flow.response.raw_content)
@@ -173,10 +173,6 @@ def done():
mitmproxy.ctx.log("HAR dump finished (wrote %s bytes to file)" % len(json_dump))
-def format_datetime(dt):
- return dt.replace(tzinfo=pytz.timezone("UTC")).isoformat()
-
-
def format_cookies(cookie_list):
rv = []
@@ -198,7 +194,7 @@ def format_cookies(cookie_list):
# Expiration time needs to be formatted
expire_ts = cookies.get_expiration_ts(attrs)
if expire_ts is not None:
- cookie_har["expires"] = format_datetime(datetime.fromtimestamp(expire_ts))
+ cookie_har["expires"] = datetime.fromtimestamp(expire_ts, timezone.utc).isoformat()
rv.append(cookie_har)
diff --git a/setup.py b/setup.py
index a942a9e3..bbbac95e 100644
--- a/setup.py
+++ b/setup.py
@@ -113,7 +113,6 @@ setup(
],
'examples': [
"beautifulsoup4>=4.4.1, <4.6",
- "pytz>=2015.07.0, <=2016.10",
"Pillow>=3.2, <4.1",
]
}