diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-11-22 18:08:10 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-11-22 18:08:10 +0100 |
| commit | 48f911c4c49551ae58068c51412d935dd6f920ad (patch) | |
| tree | a0429857027ecb8cff3e713bcfb3b55ed055cad5 /pyload/plugins/Plugin.py | |
| parent | [SimpleCrypter][SimpleHoster] Fix info attr init (diff) | |
| parent | [XFSHoster] Improve ERROR_PATTERN + revert direct link detection in getDownlo... (diff) | |
| download | pyload-48f911c4c49551ae58068c51412d935dd6f920ad.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
module/PluginThread.py
pyload/plugins/Plugin.py
pyload/plugins/hoster/RarefileNet.py
pyload/plugins/internal/MultiHoster.py
pyload/plugins/internal/SimpleCrypter.py
pyload/plugins/internal/SimpleHoster.py
pyload/plugins/internal/XFSHoster.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 a81fbef33..cf4debd37 100644 --- a/pyload/plugins/Plugin.py +++ b/pyload/plugins/Plugin.py @@ -16,7 +16,8 @@ from itertools import islice from traceback import print_exc from urlparse import urlparse -from pyload.utils import encode, fs_decode, fs_encode, html_unescape, safe_join +from pyload.utils import fs_decode, fs_encode, safe_join, safe_path + def chunks(iterable, size): it = iter(iterable) |