Changeset 7424cf

Timestamp:

05/09/2013 09:29:04 PM (12 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

2.0.x, develop, master

Children:

bf77f4

Parents:

b6a3161

Message:

Fix error in previous commit (b6a3161) and added test

Location:

deluge

Files:

• core/core.py (modified) (1 diff)
• tests/test_core.py (modified) (1 diff)

deluge/core/core.py

@@ -486 +486 @@
     def get_config_values(self, keys):
         """Get the config values for the entered keys"""
-        return {(key, self.config.get(key)) for key in keys}
+        return dict((key, self.config.get(key)) for key in keys)
 
     @export

deluge/tests/test_core.py

@@ -202 +202 @@
             self.assertEquals(deluge.core.torrent.sanitize_filepath(key, folder=False), pathlist[key])
             self.assertEquals(deluge.core.torrent.sanitize_filepath(key, folder=True), pathlist[key] + '/')
+
+    def test_get_set_config_values(self):
+        self.assertEquals(self.core.get_config_values(["abc", "foo"]), {"foo": None, "abc": None})
+        self.assertEquals(self.core.get_config_value("foobar"), None)
+        self.core.set_config({"abc": "def", "foo": 10, "foobar": "barfoo"})
+        self.assertEquals(self.core.get_config_values(["foo", "abc"]), {"foo": 10, "abc": "def"})
+        self.assertEquals(self.core.get_config_value("foobar"), "barfoo")