diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2015-02-28 22:34:54 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2015-02-28 22:34:54 +0100 |
| commit | e9f69e9df0fd1cd484670af180d64caea53eaa5c (patch) | |
| tree | b9e39821e948cb8dbe0adf79f9109f010314aef3 /pyload/manager | |
| parent | Merge branch 'stable' into 0.4.10 (diff) | |
| download | pyload-e9f69e9df0fd1cd484670af180d64caea53eaa5c.tar.xz | |
safe_join -> fs_join
Diffstat (limited to 'pyload/manager')
| -rw-r--r-- | pyload/manager/thread/Plugin.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pyload/manager/thread/Plugin.py b/pyload/manager/thread/Plugin.py index 70ee747a8..1e7d7b4e4 100644 --- a/pyload/manager/thread/Plugin.py +++ b/pyload/manager/thread/Plugin.py @@ -17,7 +17,7 @@ from pycurl import error from pyload.datatype.File import PyFile from pyload.plugin.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload from pyload.utils.packagetools import parseNames -from pyload.utils import safe_join +from pyload.utils import fs_join from pyload.api import OnlineStatus class PluginThread(Thread): @@ -47,11 +47,11 @@ class PluginThread(Thread): for f in listdir(join("tmp", pyfile.pluginname)): try: # avoid encoding errors - zip.write(join("tmp", pyfile.pluginname, f), safe_join(pyfile.pluginname, f)) + zip.write(join("tmp", pyfile.pluginname, f), fs_join(pyfile.pluginname, f)) except Exception: pass - info = zipfile.ZipInfo(safe_join(pyfile.pluginname, "debug_Report.txt"), gmtime()) + info = zipfile.ZipInfo(fs_join(pyfile.pluginname, "debug_Report.txt"), gmtime()) info.external_attr = 0644 << 16L # change permissions zip.writestr(info, dump) |