diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-07 16:59:23 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-07 16:59:23 +0200 |
| commit | 665770b16e6ace161e9c358c6b23f1f269b5dd4b (patch) | |
| tree | 8ce46a04e7081bb85d235e53c8bf47c34572e57e | |
| parent | [SimpleDereferer][SimpleHoster] Update user-agent (diff) | |
| download | pyload-665770b16e6ace161e9c358c6b23f1f269b5dd4b.tar.xz | |
[SimpleDereferer] Update user-agent (2)
| -rw-r--r-- | module/plugins/internal/SimpleDereferer.py | 5 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py index 41c6aa985..bdb2d773c 100644 --- a/module/plugins/internal/SimpleDereferer.py +++ b/module/plugins/internal/SimpleDereferer.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +import pycurl import re from urllib import unquote @@ -11,7 +12,7 @@ from module.plugins.internal.SimpleHoster import getFileURL, set_cookies class SimpleDereferer(Crypter): __name__ = "SimpleDereferer" __type__ = "crypter" - __version__ = "0.09" + __version__ = "0.10" __pattern__ = r'^unmatchable$' __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), @@ -70,7 +71,7 @@ class SimpleDereferer(Crypter): self.html = "" self.req.setOption("timeout", 120) - self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0") + self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0") #@NOTE: Work-around to old user-agent bug; remove in 0.4.10 if isinstance(self.COOKIES, list): set_cookies(self.req.cj, self.COOKIES) diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 4446eed00..0474a5af5 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -239,7 +239,7 @@ def secondsToMidnight(gmt=0): if hasattr(td, 'total_seconds'): res = td.total_seconds() - else: #: work-around for python 2.5 and 2.6 missing datetime.timedelta.total_seconds + else: #@NOTE: work-around for python 2.5 and 2.6 missing datetime.timedelta.total_seconds res = (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6 return int(res) @@ -434,7 +434,7 @@ class SimpleHoster(Hoster): self.fail(_("Required account not found")) self.req.setOption("timeout", 120) - self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0") + self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0") #@NOTE: Work-around to old user-agent bug; remove in 0.4.10 if isinstance(self.COOKIES, list): set_cookies(self.req.cj, self.COOKIES) @@ -500,7 +500,7 @@ class SimpleHoster(Hoster): raise Fail(e) - #: Work-around to `filename*=UTF-8` bug; remove in 0.4.10 + #@NOTE: Work-around to `filename*=UTF-8` bug; remove in 0.4.10 def download(self, url, get={}, post={}, ref=True, cookies=True, disposition=False): try: if disposition: |