fix -r option, read file in binary mode

This commit is contained in:
Maximilian Hils 2012-07-24 03:06:12 +02:00
parent 4ce309107a
commit c643234c98
2 changed files with 2 additions and 2 deletions

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

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)