summaryrefslogtreecommitdiffstats
path: root/pyload/utils
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-28 22:34:54 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-28 22:34:54 +0100
commite9f69e9df0fd1cd484670af180d64caea53eaa5c (patch)
treeb9e39821e948cb8dbe0adf79f9109f010314aef3 /pyload/utils
parentMerge branch 'stable' into 0.4.10 (diff)
downloadpyload-e9f69e9df0fd1cd484670af180d64caea53eaa5c.tar.xz
safe_join -> fs_join
Diffstat (limited to 'pyload/utils')
-rw-r--r--pyload/utils/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyload/utils/__init__.py b/pyload/utils/__init__.py
index 330ee622c..bfcc48621 100644
--- a/pyload/utils/__init__.py
+++ b/pyload/utils/__init__.py
@@ -74,13 +74,13 @@ def save_path(name):
return safe_filename(name)
-def safe_join(*args):
+def fs_join(*args):
""" joins a path, encoding aware """
return fs_encode(join(*[x if type(x) == unicode else decode(x) for x in args]))
#: Deprecated method
def save_join(*args):
- return safe_join(*args)
+ return fs_join(*args)
# File System Encoding functions: