diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-09-28 21:19:03 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-09-28 21:19:03 +0200 |
| commit | 46c6fc74a4e423927554f024b78dbbbf33e982cd (patch) | |
| tree | e7ff9580bb5e80b91e2bd9609409116a19c5941e /pyload/plugins/Plugin.py | |
| parent | Api : Add brackets and pipe to urlmatcher (diff) | |
| parent | [XFileSharingPro] Fixed typo (diff) | |
| download | pyload-46c6fc74a4e423927554f024b78dbbbf33e982cd.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
pyload/plugins/crypter/MultiuploadCom.py
pyload/plugins/crypter/SerienjunkiesOrg.py
pyload/plugins/hooks/ExternalScripts.py
pyload/plugins/hooks/ExtractArchive.py
pyload/plugins/hooks/MergeFiles.py
pyload/plugins/hoster/CatShareNet.py
pyload/plugins/hoster/FilezyNet.py
pyload/plugins/hoster/IFileWs.py
pyload/plugins/hoster/PremiumTo.py
pyload/plugins/hoster/SpeedyshareCom.py
pyload/plugins/hoster/UptoboxCom.py
pyload/plugins/hoster/XFileSharingPro.py
pyload/plugins/hoster/ZippyshareCom.py
Diffstat (limited to 'pyload/plugins/Plugin.py')
| -rw-r--r-- | pyload/plugins/Plugin.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pyload/plugins/Plugin.py b/pyload/plugins/Plugin.py index 31cbfca57..6bb325760 100644 --- a/pyload/plugins/Plugin.py +++ b/pyload/plugins/Plugin.py @@ -422,7 +422,8 @@ class Plugin(Base): """ if self.pyfile.abort: raise Abort #utf8 vs decode -> please use decode attribute in all future plugins - if type(url) == unicode: url = str(url) + if type(url) == unicode: + url = str(url) # encode('utf8') res = self.req.load(url, get, post, ref, cookies, just_header, decode=decode) |