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, 14 insertions, 11 deletions

diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py
index a1ec1378a..05fe897d2 100644
--- a/module/plugins/hoster/SoundcloudCom.py
+++ b/module/plugins/hoster/SoundcloudCom.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
 import pycurl
+import re
 
 from module.plugins.Hoster import Hoster
 
@@ -9,34 +9,37 @@ from module.plugins.Hoster import Hoster
 class SoundcloudCom(Hoster):
     __name__ = "SoundcloudCom"
     __type__ = "hoster"
-    __pattern__ = r'https?://(?:www\.)?soundcloud\.com/(?P<UID>.*?)/(?P<SID>.*)'
     __version__ = "0.1"
+
+    __pattern__ = r'https?://(?:www\.)?soundcloud\.com/(?P<UID>.*?)/(?P<SID>.*)'
+
     __description__ = """SoundCloud.com hoster plugin"""
     __author_name__ = "Peekayy"
     __author_mail__ = "peekayy.dev@gmail.com"
 
+
     def process(self, pyfile):
         # default UserAgent of HTTPRequest fails for this hoster so we use this one
         self.req.http.c.setopt(pycurl.USERAGENT, 'Mozilla/5.0')
         page = self.load(pyfile.url)
-        match = re.search(r'<div class="haudio.*?large.*?" data-sc-track="(?P<ID>[0-9]*)"', page)
+        m = re.search(r'<div class="haudio.*?large.*?" data-sc-track="(?P<ID>[0-9]*)"', page)
         songId = clientId = ""
-        if match:
-            songId = match.group("ID")
+        if m:
+            songId = m.group("ID")
         if len(songId) <= 0:
             self.logError("Could not find song id")
             self.offline()
         else:
-            match = re.search(r'"clientID":"(?P<CID>.*?)"', page)
-            if match:
-                clientId = match.group("CID")
+            m = re.search(r'"clientID":"(?P<CID>.*?)"', page)
+            if m:
+                clientId = m.group("CID")
 
             if len(clientId) <= 0:
                 clientId = "b45b1aa10f1ac2941910a7f0d10f8e28"
 
-            match = re.search(r'<em itemprop="name">\s(?P<TITLE>.*?)\s</em>', page)
-            if match:
-                pyfile.name = match.group("TITLE") + ".mp3"
+            m = re.search(r'<em itemprop="name">\s(?P<TITLE>.*?)\s</em>', page)
+            if m:
+                pyfile.name = m.group("TITLE") + ".mp3"
             else:
                 pyfile.name = re.match(self.__pattern__, pyfile.url).group("SID") + ".mp3"