diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-09-21 00:32:41 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-09-21 00:32:41 +0200 |
| commit | 5a68fb7729451f6d52e00a8c1147066b30a0df09 (patch) | |
| tree | 26d3b8e2ce0db147198c47208acee62dff420cec /module/plugins/internal | |
| parent | Merge pull request #1829 from GammaC0de/patch-1 (diff) | |
| parent | Update Plugin.py (diff) | |
| download | pyload-5a68fb7729451f6d52e00a8c1147066b30a0df09.tar.xz | |
Merge branch 'pr/n1788_GammaC0de' into stable
Conflicts:
module/plugins/internal/Plugin.py
Diffstat (limited to 'module/plugins/internal')
| -rw-r--r-- | module/plugins/internal/Plugin.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py index fc05e2a5b..feabe9f1d 100644 --- a/module/plugins/internal/Plugin.py +++ b/module/plugins/internal/Plugin.py @@ -7,7 +7,7 @@ import inspect import os import re import urllib -import unicodedata +import sys if os.name != "nt": import grp @@ -176,7 +176,7 @@ def chunks(iterable, size): class Plugin(object): __name__ = "Plugin" __type__ = "hoster" - __version__ = "0.31" + __version__ = "0.32" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -375,7 +375,7 @@ class Plugin(object): #@TODO: Move to network in 0.4.10 if isinstance(decode, basestring): - res = decode(res, decode) + res = sys.modules[__name__].decode(res, decode) #@TODO: See #1787, use utils.decode() in 0.4.10 if self.pyload.debug: frame = inspect.currentframe() |