summaryrefslogtreecommitdiffstats
path: root/module/plugins/internal
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-30 22:04:29 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-30 22:04:29 +0200
commit416acbd2adb459a04a52c3270ea0a31bfa40fd84 (patch)
tree4e200e51d395cf0f040201a08ce88633e2fe41c3 /module/plugins/internal
parentSpare code cosmetics (diff)
downloadpyload-416acbd2adb459a04a52c3270ea0a31bfa40fd84.tar.xz
Fix https://github.com/pyload/pyload/issues/1374
Diffstat (limited to 'module/plugins/internal')
-rw-r--r--module/plugins/internal/SimpleHoster.py15
1 files changed, 1 insertions, 14 deletions
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 0bc529cbe..df3d66ea2 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -6,7 +6,6 @@ import os
import re
import time
import urllib
-import urllib2
import urlparse
from module.PyFile import statusMap as _statusMap
@@ -245,7 +244,7 @@ def secondsToMidnight(gmt=0):
class SimpleHoster(Hoster):
__name__ = "SimpleHoster"
__type__ = "hoster"
- __version__ = "1.39"
+ __version__ = "1.40"
__pattern__ = r'^unmatchable$'
__config__ = [("use_premium", "bool", "Use premium account if available", True)]
@@ -496,18 +495,6 @@ class SimpleHoster(Hoster):
raise Fail(e)
- #@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:
- content = urllib2.urlopen(url).info()['Content-Disposition'].split(';')
- self.pyfile.name = (content[1].split('filename=')[1].strip('"\'')
- or urlparse.urlparse(urllib.unquote(url)).path.split('/')[-1]
- or self.pyfile.name)
- finally:
- return super(SimpleHoster, self).download(url, get, post, ref, cookies, False)
-
-
def downloadLink(self, link, disposition=True):
if link and isinstance(link, basestring):
self.correctCaptcha()