From 3a94a33b569b0062a4446600f59f5064d801c7f8 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Mon, 20 Jul 2009 08:39:46 +0000 Subject: [PATCH] just return the deferred created by httpdownloader --- deluge/ui/web/json_api.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py index e3f2227d8..4117bd73a 100644 --- a/deluge/ui/web/json_api.py +++ b/deluge/ui/web/json_api.py @@ -441,13 +441,11 @@ class WebApi(JSONComponent): """ tmp_file = os.path.join(tempfile.gettempdir(), url.split("/")[-1]) - d = Deferred() - httpdownloader.download_file(url, tmp_file).addCallback(self._on_torrent_downloaded, tmp_file, d) - return d + return httpdownloader.download_file(url, tmp_file).addCallback(self._on_torrent_downloaded, tmp_file) - def _on_torrent_downloaded(self, result, filename, d): + def _on_torrent_downloaded(self, result, filename): log.debug("filename: %s", filename) - d.callback(filename) + return filename @export def get_torrent_info(self, filename):