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, 3 deletions

diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py
index 2ed7744d7..e4200e9f2 100644
--- a/module/plugins/hoster/LinksnappyCom.py
+++ b/module/plugins/hoster/LinksnappyCom.py
@@ -1,23 +1,27 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from urlparse import urlsplit
 
-from module.plugins.Hoster import Hoster
 from module.common.json_layer import json_loads, json_dumps
+from module.plugins.Hoster import Hoster
 
 
 class LinksnappyCom(Hoster):
     __name__ = "LinksnappyCom"
-    __version__ = "0.02"
     __type__ = "hoster"
+    __version__ = "0.02"
+
     __pattern__ = r'https?://(?:[^/]*\.)?linksnappy\.com'
+
     __description__ = """Linksnappy.com hoster plugin"""
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
 
     SINGLE_CHUNK_HOSTERS = ('easybytez.com')
 
+
     def setup(self):
         self.chunkLimit = -1
         self.resumeDownload = True
@@ -34,7 +38,7 @@ class LinksnappyCom(Hoster):
             json_params = json_dumps({'link': pyfile.url,
                                       'type': host,
                                       'username': self.user,
-                                      'password': self.account.getAccountData(self.user)["password"]})
+                                      'password': self.account.getAccountData(self.user)['password']})
             r = self.load('http://gen.linksnappy.com/genAPI.php',
                           post={'genLinks': json_params})
             self.logDebug("JSON data: " + r)