diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-02-01 16:48:46 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-02-02 17:26:31 +0100 |
| commit | 79aa99427550e738007e8b87d41e5c097cd06c46 (patch) | |
| tree | db4a51e4d5fc31991726c9f5050627a08d06acc8 /mitmproxy/test | |
| parent | 8b6e3d8bd37ad2f806b55cf5974ed9c3d73596ac (diff) | |
| download | mitmproxy-79aa99427550e738007e8b87d41e5c097cd06c46.tar.gz mitmproxy-79aa99427550e738007e8b87d41e5c097cd06c46.tar.bz2 mitmproxy-79aa99427550e738007e8b87d41e5c097cd06c46.zip | |
fix merge
Diffstat (limited to 'mitmproxy/test')
| -rw-r--r-- | mitmproxy/test/tflow.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mitmproxy/test/tflow.py b/mitmproxy/test/tflow.py index 5749bd52..a5670538 100644 --- a/mitmproxy/test/tflow.py +++ b/mitmproxy/test/tflow.py @@ -115,13 +115,14 @@ def tflow(client_conn=True, server_conn=True, req=True, resp=None, err=None): return f -def tdummyflow(client_conn=True, server_conn=True, err=None): - class DummyFlow(flow.Flow): - """A flow that is neither HTTP nor TCP.""" +class DummyFlow(flow.Flow): + """A flow that is neither HTTP nor TCP.""" + + def __init__(self, client_conn, server_conn, live=None): + super().__init__("dummy", client_conn, server_conn, live) - def __init__(self, client_conn, server_conn, live=None): - super().__init__("dummy", client_conn, server_conn, live) +def tdummyflow(client_conn=True, server_conn=True, err=None): if client_conn is True: client_conn = tclient_conn() if server_conn is True: |