Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 8 insertions, 16 deletions

diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py
index 8dc7f3a30..f21247cf4 100644
--- a/module/plugins/accounts/XFileSharingPro.py
+++ b/module/plugins/accounts/XFileSharingPro.py
@@ -6,7 +6,8 @@ from module.plugins.internal.XFSAccount import XFSAccount
 class XFileSharingPro(XFSAccount):
     __name__    = "XFileSharingPro"
     __type__    = "account"
-    __version__ = "0.06"
+    __version__ = "0.09"
+    __status__  = "testing"
 
     __description__ = """XFileSharingPro multi-purpose account plugin"""
     __license__     = "GPLv3"
@@ -16,19 +17,10 @@ class XFileSharingPro(XFSAccount):
     HOSTER_DOMAIN = None
 
 
-    def init(self):
-        if self.HOSTER_DOMAIN:
-            return super(XFileSharingPro, self).init()
+    def login(self, user, password, data, req):
+        try:
+            return super(XFileSharingPro, self).login(user, data, req)
 
-
-    def loadAccountInfo(self, user, req):
-        return super(XFileSharingPro if self.HOSTER_DOMAIN else XFSAccount, self).loadAccountInfo(user, req)
-
-
-    def login(self, user, data, req):
-        if self.HOSTER_DOMAIN:
-            try:
-                return super(XFileSharingPro, self).login(user, data, req)
-            except Exception:
-                self.HOSTER_URL = self.HOSTER_URL.replace("www.", "")
-                return super(XFileSharingPro, self).login(user, data, req)
+        except Fail:
+            self.HOSTER_URL = self.HOSTER_URL.replace("www.", "")
+            return super(XFileSharingPro, self).login(user, data, req)