Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 7 insertions, 6 deletions

diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py
index 1cc505b81..684fb1e46 100644
--- a/module/plugins/crypter/TusfilesNetFolder.py
+++ b/module/plugins/crypter/TusfilesNetFolder.py
@@ -10,7 +10,8 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 class TusfilesNetFolder(XFSCrypter):
     __name__    = "TusfilesNetFolder"
     __type__    = "crypter"
-    __version__ = "0.08"
+    __version__ = "0.09"
+    __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
@@ -27,11 +28,11 @@ class TusfilesNetFolder(XFSCrypter):
     URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.tusfiles.net/go/\g<ID>/')]
 
 
-    def loadPage(self, page_n):
-        return self.load(urlparse.urljoin(self.pyfile.url, str(page_n)), decode=True)
+    def load_page(self, page_n):
+        return self.load(urlparse.urljoin(self.pyfile.url, str(page_n)))
 
 
-    def handlePages(self, pyfile):
+    def handle_pages(self, pyfile):
         pages = re.search(self.PAGES_PATTERN, self.html)
         if pages:
             pages = int(math.ceil(int(pages.group('pages')) / 25.0))
@@ -39,8 +40,8 @@ class TusfilesNetFolder(XFSCrypter):
             return
 
         for p in xrange(2, pages + 1):
-            self.html = self.loadPage(p)
-            self.links += self.getLinks()
+            self.html = self.load_page(p)
+            self.links += self.get_links()
 
 
 getInfo = create_getInfo(TusfilesNetFolder)