summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Garland <johnnybg+deluge@gmail.com>2010-10-03 18:33:57 +1100
committerJohn Garland <johnnybg+deluge@gmail.com>2010-10-03 19:24:29 +1100
commit0c687c7684bd7f11fa0edfb89ce15c1f02b166bc (patch)
tree500010c4ab68b52803fcd0787d84fed62a86340f
parent78f9efefd90bd2d0602e0f970fc7bf4e2c9e2ffa (diff)
downloaddeluge-0c687c7684bd7f11fa0edfb89ce15c1f02b166bc.tar.gz
deluge-0c687c7684bd7f11fa0edfb89ce15c1f02b166bc.tar.bz2
deluge-0c687c7684bd7f11fa0edfb89ce15c1f02b166bc.zip
Make sure config value strings are utf8 encoded (fixes #1369)
-rw-r--r--deluge/config.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/deluge/config.py b/deluge/config.py
index c2e760432..ab0476f1a 100644
--- a/deluge/config.py
+++ b/deluge/config.py
@@ -146,7 +146,8 @@ class Config(object):
self._save_timer = None
if defaults:
- self.__config = dict(defaults)
+ for key, value in defaults.iteritems():
+ self.set_item(key, value)
# Load the config from file in the config_dir
if config_dir:
@@ -187,6 +188,9 @@ what is currently in the config and it could not convert the value
5
"""
+ if isinstance(value, basestring):
+ value = deluge.common.utf8_encoded(value)
+
if not self.__config.has_key(key):
self.__config[key] = value
log.debug("Setting '%s' to %s of %s", key, value, type(value))