aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/flow.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-30 03:42:11 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-30 03:42:11 +0200
commit3873e08339fd701738a1522af32e37363fcec14b (patch)
tree80b17775ca5f13b926d37e74356c3c12cec6a711 /libmproxy/flow.py
parent08655cb9567f502ec79799499968c57125d9a205 (diff)
downloadmitmproxy-3873e08339fd701738a1522af32e37363fcec14b.tar.gz
mitmproxy-3873e08339fd701738a1522af32e37363fcec14b.tar.bz2
mitmproxy-3873e08339fd701738a1522af32e37363fcec14b.zip
remove old code
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r--libmproxy/flow.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index dac607a0..a2f57512 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -8,15 +8,16 @@ import Cookie
import cookielib
import os
import re
+from libmproxy.protocol.http import HTTPFlow
from libmproxy.protocol2.http_replay import RequestReplayThread
-from netlib import odict, wsgi, tcp
+from netlib import odict, wsgi
from netlib.http.semantics import CONTENT_MISSING
import netlib.http
from . import controller, protocol, tnetstring, filt, script, version
from .onboarding import app
-from .protocol import http, handle
+from .protocol import http
from .proxy.config import HostMatcher
from .proxy.connection import ClientConnection, ServerConnection
import urlparse
@@ -1090,7 +1091,7 @@ class FlowReader:
"Incompatible serialized data version: %s" % v
)
off = self.fo.tell()
- yield handle.protocols[data["type"]]["flow"].from_state(data)
+ yield HTTPFlow.from_state(data)
except ValueError as v:
# Error is due to EOF
if self.fo.tell() == off and self.fo.read() == '':