Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-30 03:14:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54 from mhils/fix_r_option

Browse Source 
fix -r option, read file in binary mode
This commit is contained in:
Aldo Cortesi 2012-07-23 18:47:03 -07:00
commit a5bf9d3eb3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmproxy/console/__init__.py
View File

@ -649,7 +649,7 @@ class ConsoleMaster(flow.FlowMaster):
self.state.last_saveload = path self.state.last_saveload = path
path = os.path.expanduser(path) path = os.path.expanduser(path)
try: try:
f = file(path, "r") f = file(path, "rb")
fr = flow.FlowReader(f) fr = flow.FlowReader(f)
except IOError, v: except IOError, v:
return v.strerror return v.strerror

2
libmproxy/dump.py
View File

@ -121,7 +121,7 @@ class DumpMaster(flow.FlowMaster):
if options.rfile: if options.rfile:
path = os.path.expanduser(options.rfile) path = os.path.expanduser(options.rfile)
try: try:
f = file(path, "r") f = file(path, "rb")
freader = flow.FlowReader(f) freader = flow.FlowReader(f)
except IOError, v: except IOError, v:
raise DumpError(v.strerror) raise DumpError(v.strerror)