From 02ac8cb78019bd5c24b5c159a341ff92f1a845b5 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 24 Sep 2010 11:16:05 +0400 Subject: [PATCH] Fix pathJoin. Fix result of join ('/some/path',''). Right result is /some/path. --- pym/cl_utils.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pym/cl_utils.py b/pym/cl_utils.py index 90dd778..d9d6ea8 100644 --- a/pym/cl_utils.py +++ b/pym/cl_utils.py @@ -526,12 +526,10 @@ def pathJoin(*paths): """Складывает пути, в отличии от os.path.join, складывает абсолютные пути""" if len(paths)==1: return paths[0] - return os.path.join(paths[0], - reduce(os.path.join, - filter(lambda x:x and x != "/", - map(lambda x: x.startswith("/") and x[1:] or x, - paths[1:])),'')) - + return reduce(os.path.join, + filter(lambda x:x and x != "/", + map(lambda x: x.startswith("/") and x[1:] or x, + paths[1:])),paths[0]) def getUserPassword(flag="dialog", pwDialog=False): """Получить пароль у пользователя