Merge pull request #1631 from cortesi/nomaster

Kill flow.master - create master.Master

2 files changed, 5 insertions, 5 deletions

diff --git a/examples/flowbasic b/examples/flowbasic
index 67c6f596..0eb163a4 100755
--- a/examples/flowbasic
+++ b/examples/flowbasic
@@ -12,10 +12,10 @@ from mitmproxy import flow, controller, options
 from mitmproxy.proxy import ProxyServer, ProxyConfig
 
 
-class MyMaster(flow.FlowMaster):
+class MyMaster(master.Master):
     def run(self):
         try:
-            flow.FlowMaster.run(self)
+            master.Master.run(self)
         except KeyboardInterrupt:
             self.shutdown()
 
diff --git a/examples/stickycookies b/examples/stickycookies
index 43e5371d..a0ee90ff 100755
--- a/examples/stickycookies
+++ b/examples/stickycookies
@@ -10,14 +10,14 @@ from mitmproxy import controller, proxy
 from mitmproxy.proxy.server import ProxyServer
 
 
-class StickyMaster(controller.Master):
+class StickyMaster(master.Master):
     def __init__(self, server):
-        controller.Master.__init__(self, server)
+        master.Master.__init__(self, server)
         self.stickyhosts = {}
 
     def run(self):
         try:
-            return controller.Master.run(self)
+            return master.Master.run(self)
         except KeyboardInterrupt:
             self.shutdown()