From a8c79d19542c424760bcb6647bfaadbcae088d8e Mon Sep 17 00:00:00 2001 From: John Garland Date: Sat, 25 Jul 2009 00:54:56 +0000 Subject: [PATCH] Use the deferred returned by getPage in test_listen_port. --- deluge/core/core.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/deluge/core/core.py b/deluge/core/core.py index d19949d6c..a979f2283 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -774,16 +774,13 @@ class Core(component.Component): """ from twisted.web.client import getPage - d = defer.Deferred() - gp = getPage("http://deluge-torrent.org/test_port.php?port=%s" % self.get_listen_port()) + d = getPage("http://deluge-torrent.org/test_port.php?port=%s" % self.get_listen_port()) def on_get_page(result): - d.callback(bool(int(result))) - def on_get_page_failure(result): - d.errback(result) + return bool(int(result)) - gp.addCallbacks(on_get_page, on_get_page_failure) + d.addCallback(on_get_page) return d