|
|
|
@ -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):
|
|
|
|
|
"""Получить пароль у пользователя
|
|
|
|
|