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/plugin/extractor/SevenZip.py | |
| parent | Merge branch 'stable' into 0.4.10 (diff) | |
| download | pyload-e9f69e9df0fd1cd484670af180d64caea53eaa5c.tar.xz | |
safe_join -> fs_join
Diffstat (limited to 'pyload/plugin/extractor/SevenZip.py')
| -rw-r--r-- | pyload/plugin/extractor/SevenZip.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pyload/plugin/extractor/SevenZip.py b/pyload/plugin/extractor/SevenZip.py index 1d7d57886..eeafd3f6f 100644 --- a/pyload/plugin/extractor/SevenZip.py +++ b/pyload/plugin/extractor/SevenZip.py @@ -6,7 +6,7 @@ import re from subprocess import Popen, PIPE from pyload.plugin.extractor.UnRar import ArchiveError, CRCError, PasswordError, UnRar, renice -from pyload.utils import fs_encode, safe_join +from pyload.utils import fs_encode, fs_join class SevenZip(UnRar): @@ -131,7 +131,7 @@ class SevenZip(UnRar): result = set() for groups in self.re_filelist.findall(out): f = groups[-1].strip() - result.add(safe_join(self.out, f)) + result.add(fs_join(self.out, f)) return list(result) |