Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/Account.py
	module/plugins/AccountManager.py
	module/plugins/Hook.py
	module/plugins/OCR.py
	module/plugins/Plugin.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	module/plugins/accounts/Ftp.py
	module/plugins/accounts/Http.py
	module/plugins/internal/MultiHoster.py
	module/plugins/ocr/GigasizeCom.py
	module/plugins/ocr/LinksaveIn.py
	module/plugins/ocr/NetloadIn.py
	module/plugins/ocr/ShareonlineBiz.py

1 files changed, 7 insertions, 22 deletions

diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py
index 3fb0d7f50..f37693206 100644
--- a/module/plugins/accounts/EuroshareEu.py
+++ b/module/plugins/accounts/EuroshareEu.py
@@ -1,22 +1,5 @@
 # -*- 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: zoidberg
-"""
-
 from time import mktime, strptime
 import re
 
@@ -25,22 +8,24 @@ from module.plugins.Account import Account
 
 class EuroshareEu(Account):
     __name__ = "EuroshareEu"
-    __version__ = "0.01"
     __type__ = "account"
+    __version__ = "0.01"
+
     __description__ = """Euroshare.eu account plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
+
     def loadAccountInfo(self, user, req):
         self.relogin(user)
         html = req.load("http://euroshare.eu/customer-zone/settings/")
 
-        found = re.search('id="input_expire_date" value="(\d+\.\d+\.\d+ \d+:\d+)"', html)
-        if found is None:
+        m = re.search('id="input_expire_date" value="(\d+\.\d+\.\d+ \d+:\d+)"', html)
+        if m is None:
             premium, validuntil = False, -1
         else:
             premium = True
-            validuntil = mktime(strptime(found.group(1), "%d.%m.%Y %H:%M"))
+            validuntil = mktime(strptime(m.group(1), "%d.%m.%Y %H:%M"))
 
         return {"validuntil": validuntil, "trafficleft": -1, "premium": premium}
 
@@ -49,7 +34,7 @@ class EuroshareEu(Account):
         html = req.load('http://euroshare.eu/customer-zone/login/', post={
             "trvale": "1",
             "login": user,
-            "password": data["password"]
+            "password": data['password']
         }, decode=True)
 
         if u">Nesprávne prihlasovacie meno alebo heslo" in html: