diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 11:14:46 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 11:14:46 +1200 |
| commit | ed415877d48251774012bd6aad4be91e9d558b79 (patch) | |
| tree | e12a399c6df498f24aa5eeb9652dfaa90ab98dae /mitmproxy/flow.py | |
| parent | 00426534982ab7fba5617ad6422c13483a8e6521 (diff) | |
| parent | 7971dce2231bc32c25b962d425d8ad935568a699 (diff) | |
| download | mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.gz mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.bz2 mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.zip | |
Merge branch 'master' into solidcore
Diffstat (limited to 'mitmproxy/flow.py')
| -rw-r--r-- | mitmproxy/flow.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/flow.py b/mitmproxy/flow.py index ba8dec5d..1b4a999a 100644 --- a/mitmproxy/flow.py +++ b/mitmproxy/flow.py @@ -8,13 +8,13 @@ import hashlib import sys import six -from six.moves import http_cookies, http_cookiejar, urllib +from six.moves import http_cookiejar +from six.moves import urllib import os import re -from typing import List, Optional, Set -from netlib import wsgi, odict +from netlib import wsgi from netlib.exceptions import HttpException from netlib.http import Headers, http1, cookies from netlib.utils import clean_bin |