Merge pull request #536 from tekii/master

fixed exception in mitmproxy -c fix #535
This commit is contained in:
Maximilian Hils 2015-03-26 14:06:46 +01:00
commit 13860cf6b4

View File

@ -293,16 +293,20 @@ class ConsoleMaster(flow.FlowMaster):
- a list of flows, otherwise.
"""
try:
return flow.read_flows_from_paths([path])
return flow.read_flows_from_paths(path)
except flow.FlowReadError as e:
signals.status_message.send(message=e.strerror)
def client_playback_path(self, path):
if not isinstance(path, list):
path = [path]
flows = self._readflows(path)
if flows:
self.start_client_playback(flows, False)
def server_playback_path(self, path):
if not isinstance(path, list):
path = [path]
flows = self._readflows(path)
if flows:
self.start_server_playback(