From 2a6698bf5a2ebe576ae0bbcacdee69d6eed10be9 Mon Sep 17 00:00:00 2001
From: Jake Drahos <drahos@iastate.edu>
Date: Thu, 11 Jun 2015 20:27:33 -0500
Subject: Moved marking from flow to console

No longer taints the flow primitive
---
 libmproxy/flow.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'libmproxy/flow.py')

diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index 0dffc8d3..1a052f51 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -494,19 +494,8 @@ class FlowStore(FlowList):
         self._recalculate_views()
 
     def _clear(self):
-        marked_flows = []
-        for f in self._list:
-            if f.marked:
-                marked_flows.append(f)
-        if len(marked_flows) == len(self._list):
-            marked_flows = []
-                
         self._list = []
         self._set = set()
-        
-        for f in marked_flows:
-            self._add(f)
-            
         self._recalculate_views()
 
     def _recalculate_views(self):
@@ -815,9 +804,7 @@ class FlowMaster(controller.Master):
         return super(FlowMaster, self).tick(q, timeout)
 
     def duplicate_flow(self, f):
-        new_flow = f.copy()
-        new_flow.marked = False
-        return self.load_flow(new_flow)
+        return self.load_flow(f.copy())
 
     def create_request(self, method, scheme, host, port, path):
         """
-- 
cgit v1.2.3