diff options
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/crypter/FilecryptCc.py | 2 | ||||
| -rw-r--r-- | module/plugins/hoster/NetloadIn.py | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py index dedd284b3..fb53e616b 100644 --- a/module/plugins/crypter/FilecryptCc.py +++ b/module/plugins/crypter/FilecryptCc.py @@ -121,7 +121,7 @@ class FilecryptCc(Crypter): vjk = re.findall('<input type="hidden" name="jk" value="function f\(\){ return \'(.*)\';}">', self.siteWithLinks) vcrypted = re.findall('<input type="hidden" name="crypted" value="(.*)">', self.siteWithLinks) - for i in range(0, len(vcrypted)): + for i in xrange(len(vcrypted)): self.links.extend(self._getLinks(vcrypted[i], vjk[i])) except Exception, e: diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index 8cf4a03c0..b866b51c5 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -57,7 +57,7 @@ def getInfo(urls): class NetloadIn(Hoster): __name__ = "NetloadIn" __type__ = "hoster" - __version__ = "0.46" + __version__ = "0.47" __pattern__ = r'https?://(?:[^/]*\.)?netload\.in/(?:datei(.*?)(?:\.htm|/)|index\.php?id=10&file_id=)' @@ -89,7 +89,7 @@ class NetloadIn(Hoster): self.pyfile.name = self.api_data['filename'] if self.premium: - self.logDebug(" Use Premium Account") + self.logDebug("Use Premium Account") settings = self.load("http://www.netload.in/index.php?id=2&lang=en") @@ -128,7 +128,7 @@ class NetloadIn(Hoster): self.download_api_data(n + 1) return - self.logDebug(" APIDATA: " + html) + self.logDebug("APIDATA: " + html) self.api_data = {} @@ -156,7 +156,7 @@ class NetloadIn(Hoster): self.setWait(wait_time) - self.logDebug(" final wait %d seconds" % wait_time) + self.logDebug("Final wait %d seconds" % wait_time) self.wait() @@ -194,8 +194,8 @@ class NetloadIn(Hoster): self.pyfile.name = name captchawaited = False - for i in range(5): + for i in xrange(5): if not page: page = self.load(self.url) t = time() + 30 @@ -204,20 +204,20 @@ class NetloadIn(Hoster): self.logError(_("Netload HDD Crash")) self.fail(_("File temporarily not available")) - self.logDebug(" try number %d " % i) + self.logDebug("Try number %d " % i) if ">Your download is being prepared.<" in page: - self.logDebug(" We will prepare your download") + self.logDebug("We will prepare your download") self.final_wait(page) return True - self.logDebug(" Trying to find captcha") + self.logDebug("Trying to find captcha") try: - url_captcha_html = re.search('(index.php\?id=10&.*&captcha=1)', page).group(1).replace("amp;", "") + url_captcha_html = re.search(r'(index.php\?id=10&.*&captcha=1)', page).group(1).replace("amp;", "") - except Exception as e: - self.logDebug("exception during Captcha regex: %s" % e.message) + except Exception, e: + self.logDebug("Exception during Captcha regex: %s" % e.message) page = None else: @@ -262,7 +262,7 @@ class NetloadIn(Hoster): if attempt is not None: return attempt.group(1) else: - self.logDebug(" Backup try for final link") + self.logDebug("Backup try for final link") file_url_pattern = r'<a href="(.+)" class="Orange_Link">Click here' attempt = re.search(file_url_pattern, page) return "http://netload.in/" + attempt.group(1) |