Merge pull request #1 from pyload/stable

Merge

1 files changed, 10 insertions, 24 deletions

diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py
index 794e80d84..f91f4d5ba 100644
--- a/module/plugins/accounts/FilesMailRu.py
+++ b/module/plugins/accounts/FilesMailRu.py
@@ -1,42 +1,28 @@
 # -*- 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: RaNaN
-"""
-
 from module.plugins.Account import Account
 
 
 class FilesMailRu(Account):
-    __name__ = "FilesMailRu"
-    __version__ = "0.1"
-    __type__ = "account"
+    __name__    = "FilesMailRu"
+    __type__    = "account"
+    __version__ = "0.10"
+
     __description__ = """Filesmail.ru account plugin"""
-    __author_name__ = "RaNaN"
-    __author_mail__ = "RaNaN@pyload.org"
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+
 
     def loadAccountInfo(self, user, req):
         return {"validuntil": None, "trafficleft": None}
 
+
     def login(self, user, data, req):
         user, domain = user.split("@")
 
-        page = req.load("http://swa.mail.ru/cgi-bin/auth", None,
+        html = req.load("http://swa.mail.ru/cgi-bin/auth", None,
                         {"Domain": domain, "Login": user, "Password": data['password'],
                          "Page": "http://files.mail.ru/"}, cookies=True)
 
-        if "Неверное имя пользователя или пароль" in page:  # @TODO seems not to work
+        if "Неверное имя пользователя или пароль" in html:  # @TODO seems not to work
             self.wrongPassword()