diff options
-rw-r--r-- | docs/docs.conf | 2 | ||||
-rw-r--r-- | module/plugins/PluginManager.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/docs.conf b/docs/docs.conf index 57fda5930..253b2267b 100644 --- a/docs/docs.conf +++ b/docs/docs.conf @@ -8,7 +8,7 @@ output: html target: docs docformat: restructuredtext -exclude: module\.lib|module\.remote\.thriftbackend\.thriftgen|\.pyc|\.pyo|module\.plugins\.(accounts|captcha|container|crypter|hooks|hoster) +exclude: module\.lib|module\.remote\.thriftbackend\.thriftgen|\.pyc|\.pyo|module\.plugins\.(accounts|container|crypter|hooks|hoster|internal|ocr) name: pyLoad Documentation url: http://docs.pyload.org 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 |