From 611dad12a7a94fd90619a2db44cd42aab922b4e2 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Sun, 2 Oct 2016 22:52:59 -0700
Subject: Revert "Add API to programmatically create new requests (#1534)"

This reverts commit ccbdcd684b5a49c0509610a79dad3f220962a42d,
which yielded a test timeout.
---
 mitmproxy/flow/master.py    | 4 ----
 test/mitmproxy/test_flow.py | 9 ---------
 2 files changed, 13 deletions(-)

diff --git a/mitmproxy/flow/master.py b/mitmproxy/flow/master.py
index 14432357..80f633cd 100644
--- a/mitmproxy/flow/master.py
+++ b/mitmproxy/flow/master.py
@@ -187,10 +187,6 @@ class FlowMaster(controller.Master):
             rt.join()
         return rt
 
-    def new_request(self, method, scheme, host, port, path, block=False):
-        f = self.create_request(method, scheme, host, port, path)
-        return self.replay_request(f, block)
-
     @controller.handler
     def log(self, l):
         self.add_log(l.msg, l.level)
diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py
index 82126353..0fe45afb 100644
--- a/test/mitmproxy/test_flow.py
+++ b/test/mitmproxy/test_flow.py
@@ -463,15 +463,6 @@ class TestFlowMaster:
         assert s.flow_count() == 2
         assert s.index(f2) == 1
 
-    def test_new_request(self):
-        s = flow.State()
-        fm = flow.FlowMaster(
-            options.Options(),
-            DummyServer(ProxyConfig(options.Options())),
-            s
-        )
-        assert fm.new_request("GET", "http", "example.com", 80, "/")
-
     def test_create_flow(self):
         s = flow.State()
         fm = flow.FlowMaster(None, None, s)
-- 
cgit v1.2.3