aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorMarcelo Glezer <mg@tekii.com.ar>2015-01-12 14:31:18 -0300
committerMarcelo Glezer <mg@tekii.com.ar>2015-01-12 14:31:18 -0300
commit4f578866fac9e8261ad659d9a04c87822d7c9aab (patch)
tree37a4ca895fcacef65d21607e5396181c4271468c /libmproxy
parentc4aeca276405ac8c57444c5a91a177de8de6782a (diff)
downloadmitmproxy-4f578866fac9e8261ad659d9a04c87822d7c9aab.tar.gz
mitmproxy-4f578866fac9e8261ad659d9a04c87822d7c9aab.tar.bz2
mitmproxy-4f578866fac9e8261ad659d9a04c87822d7c9aab.zip
open flow files using with as max suggested
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/console/__init__.py4
-rw-r--r--libmproxy/dump.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index b2f4d96c..559c78d4 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -501,8 +501,8 @@ class ConsoleMaster(flow.FlowMaster):
flows = []
for path in paths:
path = os.path.expanduser(path)
- f = file(path, "rb")
- flows.extend(list(flow.FlowReader(f).stream()))
+ 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
diff --git a/libmproxy/dump.py b/libmproxy/dump.py
index c4a70a14..70f175f6 100644
--- a/libmproxy/dump.py
+++ b/libmproxy/dump.py
@@ -148,8 +148,8 @@ class DumpMaster(flow.FlowMaster):
flows = []
for path in paths:
path = os.path.expanduser(path)
- f = file(path, "rb")
- flows.extend(list(flow.FlowReader(f).stream()))
+ with file(path, "rb") as f:
+ flows.extend(list(flow.FlowReader(f).stream()))
except (IOError, flow.FlowReadError), v:
raise DumpError(v.strerror)
return flows