diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-03-18 13:17:48 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-03-18 13:17:48 +0100 |
| commit | a2bea3c617e53fb06383d5dfa247bf59c90e0b9a (patch) | |
| tree | 74487315edf54be1e7452e7542129e577660c0a0 /module | |
| parent | closed #254 (diff) | |
| download | pyload-a2bea3c617e53fb06383d5dfa247bf59c90e0b9a.tar.xz | |
fixes netload
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/Plugin.py | 4 | ||||
| -rw-r--r-- | module/plugins/hoster/NetloadIn.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 1bac92e55..8d9d8b35d 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -37,7 +37,7 @@ if os.name != "nt": from itertools import islice -from module.utils import save_join +from module.utils import save_join, decode def chunks(iterable, size): it = iter(iterable) @@ -304,7 +304,7 @@ class Plugin(object): if utf8: #@TODO parse header and decode automatically when needed - res = res.decode("utf8", "replace") + res = decode(res) if self.core.debug: diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index afc679a9d..6162b39af 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -55,7 +55,7 @@ class NetloadIn(Hoster): __name__ = "NetloadIn" __type__ = "hoster" __pattern__ = r"http://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)" - __version__ = "0.3" + __version__ = "0.31" __description__ = """Netload.in Download Hoster""" __config__ = [ ("dumpgen", "bool", "Generate debug page dumps on stdout", "False") ] __author_name__ = ("spoob", "RaNaN", "Gregy") @@ -134,7 +134,7 @@ class NetloadIn(Hoster): def download_html(self): self.log.debug("Netload: Entering download_html") - page = self.load(self.url) + page = self.load(self.url, utf8=True) t = time() + 30 if "/share/templates/download_hddcrash.tpl" in page: |