Merge pull request #1 from pyload/stable

Merge

1 files changed, 13 insertions, 26 deletions

diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py
index 4fe01aa5b..960ff6c3c 100644
--- a/module/plugins/accounts/BitshareCom.py
+++ b/module/plugins/accounts/BitshareCom.py
@@ -1,46 +1,33 @@
 # -*- coding: utf-8 -*-
 
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-    @author: pking
-"""
-
 from module.plugins.Account import Account
 
 
 class BitshareCom(Account):
-    __name__ = "BitshareCom"
+    __name__    = "BitshareCom"
+    __type__    = "account"
     __version__ = "0.12"
-    __type__ = "account"
+
     __description__ = """Bitshare account plugin"""
-    __author_name__ = "Paul King"
-    __author_mail__ = ""
+    __license__     = "GPLv3"
+    __authors__     = [("Paul King", None)]
+
 
     def loadAccountInfo(self, user, req):
-        page = req.load("http://bitshare.com/mysettings.html")
+        html = req.load("http://bitshare.com/mysettings.html")
 
-        if "\"http://bitshare.com/myupgrade.html\">Free" in page:
+        if "\"http://bitshare.com/myupgrade.html\">Free" in html:
             return {"validuntil": -1, "trafficleft": -1, "premium": False}
 
-        if not '<input type="checkbox" name="directdownload" checked="checked" />' in page:
+        if not '<input type="checkbox" name="directdownload" checked="checked" />' in html:
             self.logWarning(_("Activate direct Download in your Bitshare Account"))
 
         return {"validuntil": -1, "trafficleft": -1, "premium": True}
 
+
     def login(self, user, data, req):
-        page = req.load("http://bitshare.com/login.html",
-                        post={"user": user, "password": data["password"], "submit": "Login"}, cookies=True)
+        html = req.load("http://bitshare.com/login.html",
+                        post={"user": user, "password": data['password'], "submit": "Login"}, cookies=True)
+
         if "login" in req.lastEffectiveURL:
             self.wrongPassword()