Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 10 insertions, 9 deletions

diff --git a/module/plugins/hoster/MegaRapidCz.py b/module/plugins/hoster/MegaRapidCz.py
index e17dd4730..13f462585 100644
--- a/module/plugins/hoster/MegaRapidCz.py
+++ b/module/plugins/hoster/MegaRapidCz.py
@@ -4,25 +4,26 @@ import pycurl
 import re
 
 from module.network.HTTPRequest import BadHeader
-from module.network.RequestFactory import getRequest
-from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
+from module.network.RequestFactory import getRequest as get_request
+from module.plugins.internal.SimpleHoster import SimpleHoster, parse_fileInfo
 
 
-def getInfo(urls):
-    h = getRequest()
+def get_info(urls):
+    h = get_request()
     h.c.setopt(pycurl.HTTPHEADER,
                ["Accept: text/html",
                 "User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0"])
 
     for url in urls:
-        html = h.load(url, decode=True)
-        yield parseFileInfo(MegaRapidCz, url, html)
+        html = h.load(url)
+        yield parse_fileInfo(MegaRapidCz, url, html)
 
 
 class MegaRapidCz(SimpleHoster):
     __name__    = "MegaRapidCz"
     __type__    = "hoster"
-    __version__ = "0.56"
+    __version__ = "0.57"
+    __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -48,10 +49,10 @@ class MegaRapidCz(SimpleHoster):
 
 
     def setup(self):
-        self.chunkLimit = 1
+        self.chunk_limit = 1
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         m = re.search(self.LINK_PREMIUM_PATTERN, self.html)
         if m:
             self.link = m.group(1)