From e9f69e9df0fd1cd484670af180d64caea53eaa5c Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 28 Feb 2015 22:34:54 +0100 Subject: safe_join -> fs_join --- pyload/webui/app/pyload.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pyload/webui/app') diff --git a/pyload/webui/app/pyload.py b/pyload/webui/app/pyload.py index 2d1a8eb86..a52f9d05f 100644 --- a/pyload/webui/app/pyload.py +++ b/pyload/webui/app/pyload.py @@ -21,7 +21,7 @@ from pyload.utils import render_to_response, parse_permissions, parse_userdata, from pyload.webui.filters import relpath, unquotepath -from pyload.utils import formatSize, safe_join, fs_encode, fs_decode +from pyload.utils import formatSize, fs_join, fs_encode, fs_decode # Helper @@ -206,16 +206,16 @@ def downloads(): items = listdir(fs_encode(root)) for item in sorted([fs_decode(x) for x in items]): - if isdir(safe_join(root, item)): + if isdir(fs_join(root, item)): folder = { 'name': item, 'path': item, 'files': [] } - files = listdir(safe_join(root, item)) + files = listdir(fs_join(root, item)) for file in sorted([fs_decode(x) for x in files]): try: - if isfile(safe_join(root, item, file)): + if isfile(fs_join(root, item, file)): folder['files'].append(file) except Exception: pass -- cgit v1.2.3