equal
deleted
inserted
replaced
45 return "", "" |
45 return "", "" |
46 |
46 |
47 def url (*parts, **kwargs) : |
47 def url (*parts, **kwargs) : |
48 abs = kwargs.pop('abs', False) |
48 abs = kwargs.pop('abs', False) |
49 up = kwargs.pop('up', 0) |
49 up = kwargs.pop('up', 0) |
|
50 trailing = kwargs.pop('trailing', False) |
50 |
51 |
51 return '/'.join(([""]*int(abs)) + ([".."]*up) + list(parts)) |
52 return '/'.join(([""]*int(abs)) + ([".."]*up) + list(parts) + ([""]*int(trailing))) |
52 |
53 |
53 url_join = url |
54 url_join = url |
54 |
55 |
55 def path_join (*parts) : |
56 def path_join (*parts) : |
56 return os.path.join(*[part for part in parts if part is not None]) |
57 return os.path.join(*[part for part in parts if part is not None]) |