diff options
Diffstat (limited to 'libmproxy/dump.py')
| -rw-r--r-- | libmproxy/dump.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 91ccb42b..59ddcf5f 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -143,14 +143,15 @@ class DumpMaster(flow.FlowMaster): if self.o.app: self.start_app(self.o.app_host, self.o.app_port) - def _readflow(self, path): - path = os.path.expanduser(path) + def _readflow(self, paths): + """ + Utitility function that reads a list of flows + or raises a DumpError if that fails. + """ try: - f = file(path, "rb") - flows = list(flow.FlowReader(f).stream()) - except (IOError, flow.FlowReadError), v: - raise DumpError(v.strerror) - return flows + return flow.read_flows_from_paths(paths) + except flow.FlowReadError as e: + raise DumpError(e.strerror) def add_event(self, e, level="info"): needed = dict(error=0, info=1, debug=2).get(level, 1) |