Merge remote-tracking branch 'mitmproxy/master'

Merge with master
This commit is contained in:
Zohar Lorberbaum 2016-03-28 10:06:02 -07:00
parent 6d16f44ab7
commit 37483e228f

View File

@ -391,4 +391,3 @@ class TestIsJson():
headers = Headers(content_type="application/json") headers = Headers(content_type="application/json")
j = flow_export.is_json(headers, '{"name": "example", "email": "example@example.com"}') j = flow_export.is_json(headers, '{"name": "example", "email": "example@example.com"}')
assert isinstance(j, dict) assert isinstance(j, dict)