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

5 files changed, 15 insertions, 10 deletions

diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py
index 5fd7e5878..d713cedca 100644
--- a/module/plugins/accounts/RPNetBiz.py
+++ b/module/plugins/accounts/RPNetBiz.py
@@ -7,7 +7,7 @@ from module.common.json_layer import json_loads
 class RPNetBiz(Account):
     __name__    = "RPNetBiz"
     __type__    = "account"
-    __version__ = "0.14"
+    __version__ = "0.15"
     __status__  = "testing"
 
     __description__ = """RPNet.biz account plugin"""
@@ -42,7 +42,7 @@ class RPNetBiz(Account):
             self.login_fail()
 
 
-    def get_account_status(self, user, password req):
+    def get_account_status(self, user, password, req):
         #: Using the rpnet API, check if valid premium account
         res = self.load("https://premium.rpnet.biz/client_api.php",
                             get={'username': user, 'password': password,
diff --git a/module/plugins/captcha/CircleCaptcha.py b/module/plugins/captcha/CircleCaptcha.py
index 7728b4ac9..457d20a35 100644
--- a/module/plugins/captcha/CircleCaptcha.py
+++ b/module/plugins/captcha/CircleCaptcha.py
@@ -31,7 +31,7 @@ class ImageSequence:
 class CircleCaptcha(OCR):
     __name__    = "CircleCaptcha"
     __type__    = "ocr"
-    __version__ = "1.02"
+    __version__ = "1.03"
     __status__  = "testing"
 
     __description__ = """Circle captcha ocr plugin"""
@@ -255,7 +255,12 @@ class CircleCaptcha(OCR):
         missing = 0
         missingconsecutive = 0
         missinglist = []
-        minX = 0 maxX = 0 minY = 0 maxY = 0
+
+        minX = 0
+        maxX = 0
+        minY = 0
+        maxY = 0
+
         pointsofcircle = []
 
         if (c[2] < min_ray) or (c[2] > max_ray):
diff --git a/module/plugins/hoster/UnibytesCom.py b/module/plugins/hoster/UnibytesCom.py
index 3ea53e719..ac2589f47 100644
--- a/module/plugins/hoster/UnibytesCom.py
+++ b/module/plugins/hoster/UnibytesCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class UnibytesCom(SimpleHoster):
     __name__    = "UnibytesCom"
     __type__    = "hoster"
-    __version__ = "0.13"
+    __version__ = "0.14"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?unibytes\.com/[\w .-]{11}B'
@@ -48,7 +48,7 @@ class UnibytesCom(SimpleHoster):
                 self.wait(10 * 60, True)
                 self.retry()
 
-            if post_data['step'] == "last"':
+            if post_data['step'] == "last":
                 m = re.search(self.LINK_FREE_PATTERN, self.html)
                 if m:
                     self.link = m.group(1)
diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index c9f9c8ce7..90f88bb02 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.80"
+    __version__ = "0.81"
     __status__  = "testing"
 
     __pattern__ = r'http://www\d{0,2}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)'
@@ -88,7 +88,7 @@ class ZippyshareCom(SimpleHoster):
         scripts = ['\n'.join(('try{', script, '} catch(err){}')) for script in scripts]
 
         #: Get the file's url by evaluating all the scripts
-        scripts = ['var GVAR = {}'] + list(initScripts)  + scripts + ['GVAR['dlbutton_href']']
+        scripts = ["var GVAR = {}"] + list(initScripts)  + scripts + ['GVAR["dlbutton_href"]']
         return self.js.eval('\n'.join(scripts))
 
 
diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py
index fdfe92593..6fe68bb6f 100644
--- a/module/plugins/internal/Hoster.py
+++ b/module/plugins/internal/Hoster.py
@@ -47,7 +47,7 @@ def create_getInfo(klass):
 class Hoster(Plugin):
     __name__    = "Hoster"
     __type__    = "hoster"
-    __version__ = "0.09"
+    __version__ = "0.10"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'
@@ -420,7 +420,7 @@ class Hoster(Plugin):
             self.pyfile.size = self.req.size
 
         if newname:
-            newname = urlparse.urlparse(newname).path.split('/')[-1].split('*=')[-1]  #@TODO: Remove in 0.4.10
+            newname = urlparse.urlparse(newname).path.split('*=')[-1].split('/')[-1]  #@TODO: Remove in 0.4.10
 
             if disposition and newname is not name:
                 self.log_info(_("%(name)s saved as %(newname)s") % {'name': name, 'newname': newname})