From cfe68fd5c31ef2993de63693ae81ce4d8fce0239 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sat, 11 Apr 2009 12:13:10 +0100 Subject: [PATCH] Minor epydoc fixes. --- zeroinstall/injector/autopolicy.py | 2 +- zeroinstall/injector/download.py | 2 +- zeroinstall/injector/policy.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zeroinstall/injector/autopolicy.py b/zeroinstall/injector/autopolicy.py index bd779fb..2150b5d 100644 --- a/zeroinstall/injector/autopolicy.py +++ b/zeroinstall/injector/autopolicy.py @@ -29,7 +29,7 @@ class AutoPolicy(policy.Policy): self.download_only = download_only def execute(self, prog_args, main = None, wrapper = None): - """@deprecated""" + """@deprecated: use L{solve_and_download_impls} and L{run.execute}""" downloaded = self.download_uncached_implementations() if downloaded: self.handler.wait_for_blocker(downloaded) diff --git a/zeroinstall/injector/download.py b/zeroinstall/injector/download.py index 5fb31b1..3251a22 100644 --- a/zeroinstall/injector/download.py +++ b/zeroinstall/injector/download.py @@ -45,7 +45,7 @@ class Download(object): @ivar hint: hint passed by and for caller @type hint: object @ivar child: the child process - @type child: L{subprocess.Popen} + @type child: subprocess.Popen @ivar aborted_by_user: whether anyone has called L{abort} @type aborted_by_user: bool """ diff --git a/zeroinstall/injector/policy.py b/zeroinstall/injector/policy.py index 58442f3..67ad7e6 100644 --- a/zeroinstall/injector/policy.py +++ b/zeroinstall/injector/policy.py @@ -355,7 +355,8 @@ class Policy(object): @tasks.async def solve_and_download_impls(self, refresh = False): """Run L{solve_with_downloads} and then get the selected implementations too. - @raise SafeException: if we couldn't select a set of implementations""" + @raise SafeException: if we couldn't select a set of implementations + @since: 0.40""" refreshed = self.solve_with_downloads(refresh) if refreshed: yield refreshed -- 2.11.4.GIT