From a23d877a99a2f18b24fcef0fdaf2d4505a630ba7 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Sat, 20 Dec 2008 23:14:06 +0000 Subject: [PATCH] Fix more issues with TorrentOptions --- deluge/core/torrent.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index 9acc7526c..b18553959 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -93,8 +93,11 @@ class TorrentOptions(dict): def __getitem__(self, key): if super(TorrentOptions, self).has_key(key): return super(TorrentOptions, self).__getitem__(key) - elif key in self.default_keys and self.default_keys[key] in self.config: + elif key in self.default_keys: + if self.default_keys[key] in self.config: return self.config[self.default_keys[key]] + else: + return self.default_keys[key] else: raise KeyError