summaryrefslogtreecommitdiffstats
path: root/module/plugins/internal
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/internal')
-rw-r--r--module/plugins/internal/Extractor.py4
-rw-r--r--module/plugins/internal/Hoster.py4
-rw-r--r--module/plugins/internal/MultiHoster.py4
-rw-r--r--module/plugins/internal/UnZip.py4
-rw-r--r--module/plugins/internal/utils.py4
5 files changed, 10 insertions, 10 deletions
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 864792e49..95395dd1f 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -36,7 +36,7 @@ class PasswordError(Exception):
class Extractor(Plugin):
__name__ = "Extractor"
__type__ = "extractor"
- __version__ = "0.37"
+ __version__ = "0.38"
__status__ = "testing"
__description__ = """Base extractor plugin"""
@@ -76,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.is_multipart(fname) else os.path.splitext(fname)[0]
+ pname = re.sub(cls.re_multipart, "", fname) if cls.ismultipart(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/Hoster.py b/module/plugins/internal/Hoster.py
index 8f76b6c45..60a7e7779 100644
--- a/module/plugins/internal/Hoster.py
+++ b/module/plugins/internal/Hoster.py
@@ -13,7 +13,7 @@ from module.plugins.internal.utils import encode, exists, fixurl, fs_join, parse
class Hoster(Base):
__name__ = "Hoster"
__type__ = "hoster"
- __version__ = "0.40"
+ __version__ = "0.41"
__status__ = "testing"
__pattern__ = r'^unmatchable$'
@@ -98,7 +98,7 @@ class Hoster(Base):
self.restart(premium=False)
else:
- raise Fail(str(e))
+ raise Fail(encode(e))
def isdownload(self, url, resume=None, redirect=True):
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 6fa28d82d..1f87359ac 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
class MultiHoster(SimpleHoster):
__name__ = "MultiHoster"
__type__ = "hoster"
- __version__ = "0.55"
+ __version__ = "0.56"
__status__ = "testing"
__pattern__ = r'^unmatchable$'
@@ -86,7 +86,7 @@ class MultiHoster(SimpleHoster):
self.restart(_("Revert to original hoster plugin"))
else:
- raise Fail(str(e))
+ raise Fail(encode(e))
def handle_premium(self, pyfile):
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index c14742efa..0b9115bc8 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -11,7 +11,7 @@ from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError,
class UnZip(Extractor):
__name__ = "UnZip"
- __version__ = "1.18"
+ __version__ = "1.19"
__status__ = "testing"
__description__ = """Zip extractor plugin"""
@@ -29,7 +29,7 @@ class UnZip(Extractor):
@classmethod
- def is_multipart(cls, filename):
+ def ismultipart(cls, filename):
return False #@NOTE: Unsupported (rarely used anyway)
diff --git a/module/plugins/internal/utils.py b/module/plugins/internal/utils.py
index 3a3ada07d..5d73f432b 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)