diff --git a/setup.py b/setup.py index 00e1686..6aa62bf 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ def read(*rnames): ], }, extras_require = dict( - tests = ['zdaemon', 'zc.recipe.filestorage', 'PasteScript'], + tests=['zdaemon >= 3.0.0', 'zc.recipe.filestorage', 'PasteScript'], ), classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/zc/zope3recipes/winctl.py b/zc/zope3recipes/winctl.py index 30b31d8..b876eae 100644 --- a/zc/zope3recipes/winctl.py +++ b/zc/zope3recipes/winctl.py @@ -211,7 +211,7 @@ def do_debug(self, arg): self.proc = Popen(program) self.zd_pid = self.proc.pid self.zd_up = 1 - self.awhile(lambda: self.zd_pid, + self.awhile(lambda n: self.zd_pid, "Zope3 started in debug mode, pid=%(zd_pid)d") def help_debug(self): @@ -261,7 +261,7 @@ def do_stop(self, arg): self.zd_up = 0 self.zd_pid = 0 cpid = win32process.GetCurrentProcessId() - self.awhile(lambda: not getChildrenPidsOfPid(cpid), "Zope3 stopped") + self.awhile(lambda n: not getChildrenPidsOfPid(cpid), "Zope3 stopped") def do_kill(self, arg): self.do_stop(arg) @@ -273,7 +273,7 @@ def do_restart(self, arg): self.do_start(arg) else: self.do_start(arg) - self.awhile(lambda: self.zd_pid not in (0, pid), + self.awhile(lambda n: self.zd_pid not in (0, pid), "Zope3 restarted, pid=%(zd_pid)d") def show_options(self): @@ -295,7 +295,7 @@ def do_start(self, arg): self.proc = Popen(program) self.zd_pid = self.proc.pid self.zd_up = 1 - self.awhile(lambda: self.zd_pid, + self.awhile(lambda n: self.zd_pid, "Zope3 started, pid=%(zd_pid)d") def do_fg(self, arg):