diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-03-26 14:06:46 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-03-26 14:06:46 +0100 |
| commit | 13860cf6b4ffbddf285c52d2a310f63a06df8d76 (patch) | |
| tree | a6a7e978770e42d7b9875f38058e97308992a0b6 /libmproxy | |
| parent | b0f60cf1f293a19c7f87782a3ad762b77cb2a5a7 (diff) | |
| parent | fb17eea5e0adcbe8d0dc5c2f029b10b172d5a3e7 (diff) | |
| download | mitmproxy-13860cf6b4ffbddf285c52d2a310f63a06df8d76.tar.gz mitmproxy-13860cf6b4ffbddf285c52d2a310f63a06df8d76.tar.bz2 mitmproxy-13860cf6b4ffbddf285c52d2a310f63a06df8d76.zip | |
Merge pull request #536 from tekii/master
fixed exception in mitmproxy -c fix #535
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 90c8bd89..9375f973 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -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( |