equal
deleted
inserted
replaced
173 b.reverse() |
173 b.reverse() |
174 return os.sep.join((['..'] * len(a)) + b) |
174 return os.sep.join((['..'] * len(a)) + b) |
175 |
175 |
176 def canonpath(root, cwd, myname): |
176 def canonpath(root, cwd, myname): |
177 """return the canonical path of myname, given cwd and root""" |
177 """return the canonical path of myname, given cwd and root""" |
178 rootsep = root + os.sep |
178 if root == os.sep: |
|
179 rootsep = os.sep |
|
180 else: |
|
181 rootsep = root + os.sep |
179 name = myname |
182 name = myname |
180 if not name.startswith(os.sep): |
183 if not name.startswith(os.sep): |
181 name = os.path.join(root, cwd, name) |
184 name = os.path.join(root, cwd, name) |
182 name = os.path.normpath(name) |
185 name = os.path.normpath(name) |
183 if name.startswith(rootsep): |
186 if name.startswith(rootsep): |