From 277f59dfc3621139d9512b8055283713031ad1ea Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sat, 29 Jan 2011 13:57:31 +0000 Subject: [PATCH] Show downloading in progress when fetching key information Otherwise, it looks like we've finished when actually we're waiting to get the key information before showing the confirmation dialog. --- zeroinstall/injector/fetch.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zeroinstall/injector/fetch.py b/zeroinstall/injector/fetch.py index 7eb754d..29adef6 100644 --- a/zeroinstall/injector/fetch.py +++ b/zeroinstall/injector/fetch.py @@ -41,14 +41,14 @@ class KeyInfoFetcher: Example: - >>> kf = KeyInfoFetcher('https://server', fingerprint) + >>> kf = KeyInfoFetcher(handler, 'https://server', fingerprint) >>> while True: print kf.info if kf.blocker is None: break print kf.status yield kf.blocker """ - def __init__(self, server, fingerprint): + def __init__(self, handler, server, fingerprint): self.fingerprint = fingerprint self.info = [] self.blocker = None @@ -57,8 +57,7 @@ class KeyInfoFetcher: self.status = _('Fetching key information from %s...') % server - dl = download.Download(server + '/key/' + fingerprint) - dl.start() + dl = handler.get_download(server + '/key/' + fingerprint) from xml.dom import minidom @@ -305,7 +304,8 @@ class Fetcher(object): try: return self.key_info[fingerprint] except KeyError: - self.key_info[fingerprint] = key_info = KeyInfoFetcher(self.key_info_server, fingerprint) + self.key_info[fingerprint] = key_info = KeyInfoFetcher(self.handler, + self.key_info_server, fingerprint) return key_info def download_impl(self, impl, retrieval_method, stores, force = False): -- 2.11.4.GIT