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/Container.py | |
| parent | Merge branch 'stable' into 0.4.10 (diff) | |
| download | pyload-e9f69e9df0fd1cd484670af180d64caea53eaa5c.tar.xz | |
safe_join -> fs_join
Diffstat (limited to 'pyload/plugin/Container.py')
| -rw-r--r-- | pyload/plugin/Container.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pyload/plugin/Container.py b/pyload/plugin/Container.py index e2e0f2248..87d75976f 100644 --- a/pyload/plugin/Container.py +++ b/pyload/plugin/Container.py @@ -8,7 +8,7 @@ from os import remove from os.path import basename, exists from pyload.plugin.internal.Crypter import Crypter -from pyload.utils import safe_join +from pyload.utils import fs_join class Container(Crypter): @@ -45,7 +45,7 @@ class Container(Crypter): if self.pyfile.url.startswith("http"): self.pyfile.name = re.findall("([^\/=]+)", self.pyfile.url)[-1] content = self.load(self.pyfile.url) - self.pyfile.url = safe_join(self.core.config['general']['download_folder'], self.pyfile.name) + self.pyfile.url = fs_join(self.core.config['general']['download_folder'], self.pyfile.name) try: with open(self.pyfile.url, "wb") as f: f.write(content) @@ -55,8 +55,8 @@ class Container(Crypter): else: self.pyfile.name = basename(self.pyfile.url) if not exists(self.pyfile.url): - if exists(safe_join(pypath, self.pyfile.url)): - self.pyfile.url = safe_join(pypath, self.pyfile.url) + if exists(fs_join(pypath, self.pyfile.url)): + self.pyfile.url = fs_join(pypath, self.pyfile.url) else: self.fail(_("File not exists")) |