summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-07-19 01:57:58 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-07-19 01:57:58 +0200
commit17590aa53b51d91a8edecf7f2a3fba79c9666db3 (patch)
treee1a37d458aefacfc1502f733464914dc73510759 /module/plugins
parentImproved uniqify method (diff)
downloadpyload-17590aa53b51d91a8edecf7f2a3fba79c9666db3.tar.xz
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/PluginManager.py6
1 files changed, 3 insertions, 3 deletions
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