Fix https://github.com/pyload/pyload/issues/1479

4 files changed, 11 insertions, 11 deletions

diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py
index cdc8d2d53..5c73b2622 100644
--- a/module/plugins/crypter/Dereferer.py
+++ b/module/plugins/crypter/Dereferer.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class Dereferer(SimpleCrypter):
     __name__    = "Dereferer"
     __type__    = "crypter"
-    __version__ = "0.15"
+    __version__ = "0.16"
 
     __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/.*?(?P<LINK>(?:ht|f)tps?://.+)'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
@@ -24,7 +24,7 @@ class Dereferer(SimpleCrypter):
 
 
     def _log(self, type, args):
-        return super(Dereferer, self)._log(type, [self.HOSTER_NAME] + args)
+        return super(Dereferer, self)._log(type, (self.HOSTER_NAME,) + args)
 
 
     def init(self):
diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py
index 8043a1183..70e7365dd 100644
--- a/module/plugins/crypter/XFileSharingProFolder.py
+++ b/module/plugins/crypter/XFileSharingProFolder.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 class XFileSharingProFolder(XFSCrypter):
     __name__    = "XFileSharingProFolder"
     __type__    = "crypter"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:user|folder)s?/\w+'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
@@ -20,7 +20,7 @@ class XFileSharingProFolder(XFSCrypter):
 
 
     def _log(self, type, args):
-        return super(XFileSharingProFolder, self)._log(type, [self.HOSTER_NAME] + args)
+        return super(XFileSharingProFolder, self)._log(type, (self.HOSTER_NAME,) + args)
 
 
     def init(self):
diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index c62a42779..f58b7f0de 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class XFileSharingPro(XFSHoster):
     __name__    = "XFileSharingPro"
     __type__    = "hoster"
-    __version__ = "0.47"
+    __version__ = "0.48"
 
     __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:embed-)?\w{12}(?:\W|$)'
 
@@ -21,7 +21,7 @@ class XFileSharingPro(XFSHoster):
 
 
     def _log(self, type, args):
-        return super(XFileSharingPro, self)._log(type, [self.HOSTER_NAME] + args)
+        return super(XFileSharingPro, self)._log(type, (self.HOSTER_NAME,) + args)
 
 
     def init(self):
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 25a35d9d8..4a3b7dcf7 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -429,14 +429,14 @@ class SimpleHoster(Hoster):
 
 
     #@TODO: Move to Hoster in 0.4.10
-    def _log(self, type, args):
+    def _log(self, level, args):
+        log = getattr(self.core.log, level)
         msg = " | ".join((fs_encode(a) if isinstance(a, unicode) else  #@NOTE: `fs_encode` -> `encode` in 0.4.10
                           decode(a) if isinstance(a, str) else
                           str(a)).strip() for a in args if a)
-        logger = getattr(self.core.log, type)
-        logger("%(plugin)s[%(id)s]: %(msg)s" % {'plugin': self.__name__,
-                                                'id'    : self.pyfile.id,
-                                                'msg'   : msg or _(type.upper() + " MARK")})
+        log("%(plugin)s[%(id)s]: %(msg)s" % {'plugin': self.__name__,
+                                             'id'    : self.pyfile.id,
+                                             'msg'   : msg or _(level.upper() + " MARK")})
 
 
     #@TODO: Move to Hoster in 0.4.10