From 17590aa53b51d91a8edecf7f2a3fba79c9666db3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 19 Jul 2014 01:57:58 +0200 Subject: Fix c1abc13d4dccb20f3845594c28952667573b7d0b --- module/plugins/PluginManager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/PluginManager.py') diff --git a/module/plugins/PluginManager.py b/module/plugins/PluginManager.py index 8b7ed9bf2..4aa5ad575 100644 --- a/module/plugins/PluginManager.py +++ b/module/plugins/PluginManager.py @@ -32,7 +32,7 @@ from module.ConfigParser import IGNORE class PluginManager: ROOT = "module.plugins." USERROOT = "userplugins." - TYPES = ("crypter", "container", "hoster", "captcha", "accounts", "hooks", "internal") + TYPES = ("accounts", "container", "crypter", "hooks", "hoster", "internal", "ocr") PATTERN = re.compile(r'__pattern__.*=.*r("|\')([^"\']+)') VERSION = re.compile(r'__version__.*=.*("|\')([0-9.]+)') @@ -68,7 +68,7 @@ class PluginManager: self.plugins["container"] = self.containerPlugins = self.parse("container", pattern=True) self.plugins["hoster"] = self.hosterPlugins = self.parse("hoster", pattern=True) - self.plugins["captcha"] = self.captchaPlugins = self.parse("captcha") + self.plugins["ocr"] = self.captchaPlugins = self.parse("ocr") self.plugins["accounts"] = self.accountPlugins = self.parse("accounts") self.plugins["hooks"] = self.hookPlugins = self.parse("hooks") self.plugins["internal"] = self.internalPlugins = self.parse("internal") @@ -357,7 +357,7 @@ class PluginManager: self.plugins["crypter"] = self.crypterPlugins = self.parse("crypter", pattern=True) self.plugins["container"] = self.containerPlugins = self.parse("container", pattern=True) self.plugins["hoster"] = self.hosterPlugins = self.parse("hoster", pattern=True) - self.plugins["captcha"] = self.captchaPlugins = self.parse("captcha") + self.plugins["ocr"] = self.captchaPlugins = self.parse("ocr") self.plugins["accounts"] = self.accountPlugins = self.parse("accounts") if "accounts" in as_dict: #: accounts needs to be reloaded -- cgit v1.2.3