codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use binary mode on all config files for Windows compat

This commit is contained in:
Andrew Resch 2009-03-12 21:43:17 +00:00
parent d63c187dcf
commit 86d52ba2e1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deluge/config.py
View File

@ -240,10 +240,10 @@ class Config(object):
if not filename: if not filename:
filename = self.__config_file filename = self.__config_file
try: try:
self.__config.update(json.load(open(filename, "r"))) self.__config.update(json.load(open(filename, "rb")))
except Exception, e: except Exception, e:
try: try:
self.__config.update(pickle.load(open(filename, "r"))) self.__config.update(pickle.load(open(filename, "rb")))
except Exception, e: except Exception, e:
log.warning("Unable to load config file: %s", filename) log.warning("Unable to load config file: %s", filename)
@ -261,7 +261,7 @@ class Config(object):
# Check to see if the current config differs from the one on disk # Check to see if the current config differs from the one on disk
# We will only write a new config file if there is a difference # We will only write a new config file if there is a difference
try: try:
if self.__config == json.load(open(filename, "r")): if self.__config == json.load(open(filename, "rb")):
# The config has not changed so lets just return # The config has not changed so lets just return
self.__save_timer = None self.__save_timer = None
return return
@ -273,7 +273,7 @@ class Config(object):
# Save the new config and make sure it's written to disk # Save the new config and make sure it's written to disk
try: try:
log.debug("Saving new config file %s", filename + ".new") log.debug("Saving new config file %s", filename + ".new")
f = open(filename + ".new", "w") f = open(filename + ".new", "wb")
json.dump(self.__config, f, indent=2) json.dump(self.__config, f, indent=2)
f.flush() f.flush()
os.fsync(f.fileno()) os.fsync(f.fileno())