diff options
Diffstat (limited to 'module/plugins/internal')
| -rw-r--r-- | module/plugins/internal/Extractor.py | 3 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 1 | ||||
| -rw-r--r-- | module/plugins/internal/utils.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py index 005bfbfd5..864792e49 100644 --- a/module/plugins/internal/Extractor.py +++ b/module/plugins/internal/Extractor.py @@ -5,6 +5,7 @@ import re from module.PyFile import PyFile from module.plugins.internal.Plugin import Plugin +from module.plugins.internal.utils import encode def renice(pid, value): @@ -75,7 +76,7 @@ class Extractor(Plugin): for fname, id, fout in files_ids: if cls.isarchive(fname): - pname = re.sub(cls.re_multipart, "", fname) if cls.ismultipart(fname) else os.path.splitext(fname)[0] + pname = re.sub(cls.re_multipart, "", fname) if cls.is_multipart(fname) else os.path.splitext(fname)[0] if pname not in processed: processed.append(pname) targets.append((fname, id, fout)) diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index b434c55ae..7821218ae 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -2,7 +2,6 @@ from __future__ import with_statement -import os import re import time diff --git a/module/plugins/internal/utils.py b/module/plugins/internal/utils.py index 723690f39..3a3ada07d 100644 --- a/module/plugins/internal/utils.py +++ b/module/plugins/internal/utils.py @@ -162,8 +162,8 @@ def encode(value, encoding=None, decoding=None): if type(value) is unicode: res = value.encode(encoding or "utf-8") - elif type(value) is str: - res = encode(decode(value, decoding), encoding) + #elif type(value) is str: + #res = encode(decode(value, decoding), encoding) else: res = str(value) |