summaryrefslogtreecommitdiffstats
path: root/module/plugins/internal
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2015-01-09 21:07:41 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2015-01-09 21:07:41 +0100
commit8f46ca7012fd9f17a99ae9baa3394be747f26a7e (patch)
tree1946d5d4570aa19f7c907673d8c55844a14e9ea5 /module/plugins/internal
parent[BasePlugin] Fix typo (diff)
downloadpyload-8f46ca7012fd9f17a99ae9baa3394be747f26a7e.tar.xz
[MultiHook] Fix encoding in _pluginSet
Diffstat (limited to 'module/plugins/internal')
-rw-r--r--module/plugins/internal/MultiHook.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 9acf3744f..bb132252f 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -3,13 +3,13 @@
import re
from module.plugins.Hook import Hook
-from module.utils import remove_chars
+from module.utils import decode, remove_chars
class MultiHook(Hook):
__name__ = "MultiHook"
__type__ = "hook"
- __version__ = "0.31"
+ __version__ = "0.32"
__config__ = [("pluginmode" , "all;listed;unlisted", "Use for plugins" , "all"),
("pluginlist" , "str" , "Plugin list (comma separated)" , "" ),
@@ -95,6 +95,8 @@ class MultiHook(Hook):
""" see HTTPRequest for argument list """
h = pyreq.getHTTPRequest(timeout=120)
try:
+ if not 'decode' in kwargs:
+ kwargs['decode'] = True
rep = h.load(*args, **kwargs)
finally:
h.close()
@@ -139,7 +141,7 @@ class MultiHook(Hook):
def _pluginSet(self, plugins):
- plugins = set((str(x).strip().lower() for x in plugins))
+ plugins = set((decode(x).strip().lower() for x in plugins))
for rf, rt in self.DOMAIN_REPLACEMENTS:
regex = re.compile(rf)