Put DumpMaster in its own file.

It's going to become a more important part of the mitmproxy suite now.

2 files changed, 39 insertions, 36 deletions

diff --git a/libmproxy/controller.py b/libmproxy/controller.py
index f20d17b4..cd86151a 100644
--- a/libmproxy/controller.py
+++ b/libmproxy/controller.py
@@ -86,39 +86,3 @@ class Master:
             self.server.shutdown()
 
 
-class DumpMaster(Master):
-    """
-        A simple master that just dumps to screen.
-    """
-    def __init__(self, server, verbosity):
-        self.verbosity = verbosity
-        Master.__init__(self, server)
-
-    def run(self):
-        try:
-            return Master.run(self)
-        except KeyboardInterrupt:
-            self.shutdown()
-
-    def handle_response(self, msg):
-        if 0 < self.verbosity < 3:
-            print >> sys.stderr, ">>",
-            print >> sys.stderr, msg.request.short()
-        if self.verbosity == 1:
-            print >> sys.stderr, "<<",
-            print >> sys.stderr, msg.short()
-        elif self.verbosity == 2:
-            print >> sys.stderr, "<<"
-            for i in msg.assemble().splitlines():
-                print >> sys.stderr, "\t", i
-            print >> sys.stderr, "<<"
-        elif self.verbosity == 3:
-            print >> sys.stderr, ">>"
-            for i in msg.request.assemble().splitlines():
-                print >> sys.stderr, "\t", i
-            print >> sys.stderr, ">>"
-            print >> sys.stderr, "<<"
-            for i in msg.assemble().splitlines():
-                print >> sys.stderr, "\t", i
-            print >> sys.stderr, "<<"
-        msg.ack()
diff --git a/libmproxy/dump.py b/libmproxy/dump.py
new file mode 100644
index 00000000..83238da4
--- /dev/null
+++ b/libmproxy/dump.py
@@ -0,0 +1,39 @@
+import sys
+import controller
+
+class DumpMaster(controller.Master):
+    """
+        A simple master that just dumps to screen.
+    """
+    def __init__(self, server, verbosity):
+        self.verbosity = verbosity
+        controller.Master.__init__(self, server)
+
+    def run(self):
+        try:
+            return controller.Master.run(self)
+        except KeyboardInterrupt:
+            self.shutdown()
+
+    def handle_response(self, msg):
+        if 0 < self.verbosity < 3:
+            print >> sys.stderr, ">>",
+            print >> sys.stderr, msg.request.short()
+        if self.verbosity == 1:
+            print >> sys.stderr, "<<",
+            print >> sys.stderr, msg.short()
+        elif self.verbosity == 2:
+            print >> sys.stderr, "<<"
+            for i in msg.assemble().splitlines():
+                print >> sys.stderr, "\t", i
+            print >> sys.stderr, "<<"
+        elif self.verbosity == 3:
+            print >> sys.stderr, ">>"
+            for i in msg.request.assemble().splitlines():
+                print >> sys.stderr, "\t", i
+            print >> sys.stderr, ">>"
+            print >> sys.stderr, "<<"
+            for i in msg.assemble().splitlines():
+                print >> sys.stderr, "\t", i
+            print >> sys.stderr, "<<"
+        msg.ack()