diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-02-05 14:20:22 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-02-05 14:20:22 +0100 |
| commit | 19555bb39ab09f5e5b5dd663136e0105d2b3a625 (patch) | |
| tree | 8414b527267002c1bdfe04bffd1a58ce539a3b89 /libmproxy/console | |
| parent | 965cfffa5ec5bb2b395a8445027e5020272a18ed (diff) | |
| parent | 4f578866fac9e8261ad659d9a04c87822d7c9aab (diff) | |
| download | mitmproxy-19555bb39ab09f5e5b5dd663136e0105d2b3a625.tar.gz mitmproxy-19555bb39ab09f5e5b5dd663136e0105d2b3a625.tar.bz2 mitmproxy-19555bb39ab09f5e5b5dd663136e0105d2b3a625.zip | |
Merge remote-tracking branch 'tekii/master'
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/__init__.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index dc20d21f..6aabf5ed 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -498,11 +498,13 @@ class ConsoleMaster(flow.FlowMaster): self.eventlog = not self.eventlog self.view_flowlist() - def _readflow(self, path): - path = os.path.expanduser(path) + def _readflow(self, paths): try: - f = file(path, "rb") - flows = list(flow.FlowReader(f).stream()) + flows = [] + for path in paths: + path = os.path.expanduser(path) + with file(path, "rb") as f: + flows.extend(list(flow.FlowReader(f).stream())) except (IOError, flow.FlowReadError), v: return True, v.strerror return False, flows |