From 89206d9a91c9a261452e39501c59c8e122beae6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9munaire?= Date: Fri, 31 Aug 2012 05:23:21 +0200 Subject: [PATCH] Due to last commit, changes modules to follow new hooks declaration --- modules/alias/__init__.py | 4 ++-- modules/ddg/__init__.py | 34 +++++++++++++++++----------------- modules/sleepytime.py | 4 ++-- modules/syno.py | 4 ++-- modules/translate.py | 12 ++++-------- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/modules/alias/__init__.py b/modules/alias/__init__.py index 8432466..a4cb582 100644 --- a/modules/alias/__init__.py +++ b/modules/alias/__init__.py @@ -14,8 +14,8 @@ def load(context): CONTEXT = context from hooks import Hook - context.hooks.add_hook(context.hooks.cmd_hook, Hook(cmd_set, "set")) - context.hooks.add_hook(context.hooks.all_pre, Hook(treat_variables)) + context.hooks.add_hook("cmd_hook", Hook(cmd_set, "set")) + context.hooks.add_hook("all_pre", Hook(treat_variables)) global DATAS if not DATAS.hasNode("aliases"): diff --git a/modules/ddg/__init__.py b/modules/ddg/__init__.py index ba1e967..fa265c2 100644 --- a/modules/ddg/__init__.py +++ b/modules/ddg/__init__.py @@ -13,23 +13,23 @@ def load(context): WFASearch.CONF = CONF from hooks import Hook - context.hooks.add_hook(context.hooks.cmd_hook, Hook(define, "d")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(define, "def")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(define, "defini")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(define, "definit")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(define, "define")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(define, "definition")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(search, "search")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(search, "ddg")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(search, "g")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(calculate, "wa")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(calculate, "wfa")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(calculate, "calc")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(wiki, "w")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(wiki, "wf")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(wiki, "wfr")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(wiki, "we")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(wiki, "wen")) + context.hooks.add_hook("cmd_hook", Hook(define, "d")) + context.hooks.add_hook("cmd_hook", Hook(define, "def")) + context.hooks.add_hook("cmd_hook", Hook(define, "defini")) + context.hooks.add_hook("cmd_hook", Hook(define, "definit")) + context.hooks.add_hook("cmd_hook", Hook(define, "define")) + context.hooks.add_hook("cmd_hook", Hook(define, "definition")) + context.hooks.add_hook("cmd_hook", Hook(search, "search")) + context.hooks.add_hook("cmd_hook", Hook(search, "ddg")) + context.hooks.add_hook("cmd_hook", Hook(search, "g")) + context.hooks.add_hook("cmd_hook", Hook(calculate, "wa")) + context.hooks.add_hook("cmd_hook", Hook(calculate, "wfa")) + context.hooks.add_hook("cmd_hook", Hook(calculate, "calc")) + context.hooks.add_hook("cmd_hook", Hook(wiki, "w")) + context.hooks.add_hook("cmd_hook", Hook(wiki, "wf")) + context.hooks.add_hook("cmd_hook", Hook(wiki, "wfr")) + context.hooks.add_hook("cmd_hook", Hook(wiki, "we")) + context.hooks.add_hook("cmd_hook", Hook(wiki, "wen")) def reload(): imp.reload(DDGSearch) diff --git a/modules/sleepytime.py b/modules/sleepytime.py index 526a4c5..95941ff 100644 --- a/modules/sleepytime.py +++ b/modules/sleepytime.py @@ -16,8 +16,8 @@ def help_full (): def load(context): from hooks import Hook - context.hooks.add_hook(context.hooks.cmd_hook, Hook(cmd_sleep, "sleeptime")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(cmd_sleep, "sleepytime")) + context.hooks.add_hook("cmd_hook", Hook(cmd_sleep, "sleeptime")) + context.hooks.add_hook("cmd_hook", Hook(cmd_sleep, "sleepytime")) def cmd_sleep(msg): diff --git a/modules/syno.py b/modules/syno.py index b6b5710..fc61f01 100644 --- a/modules/syno.py +++ b/modules/syno.py @@ -15,8 +15,8 @@ def help_full (): def load(context): from hooks import Hook - context.hooks.add_hook(context.hooks.cmd_hook, Hook(cmd_syno, "syno")) - context.hooks.add_hook(context.hooks.cmd_hook, Hook(cmd_syno, "synonyme")) + context.hooks.add_hook("cmd_hook", Hook(cmd_syno, "syno")) + context.hooks.add_hook("cmd_hook", Hook(cmd_syno, "synonyme")) def cmd_syno(msg): diff --git a/modules/translate.py b/modules/translate.py index 56460aa..5f87262 100644 --- a/modules/translate.py +++ b/modules/translate.py @@ -15,14 +15,10 @@ LANG = ["ar", "zh", "cz", "en", "fr", "gr", "it", def load(context): from hooks import Hook - context.hooks.add_hook(context.hooks.cmd_hook, - Hook(cmd_translate, "translate")) - context.hooks.add_hook(context.hooks.cmd_hook, - Hook(cmd_translate, "traduction")) - context.hooks.add_hook(context.hooks.cmd_hook, - Hook(cmd_translate, "traduit")) - context.hooks.add_hook(context.hooks.cmd_hook, - Hook(cmd_translate, "traduire")) + context.hooks.add_hook("cmd_hook", Hook(cmd_translate, "translate")) + context.hooks.add_hook("cmd_hook", Hook(cmd_translate, "traduction")) + context.hooks.add_hook("cmd_hook", Hook(cmd_translate, "traduit")) + context.hooks.add_hook("cmd_hook", Hook(cmd_translate, "traduire")) def cmd_translate(msg):