Workaround stupid os.path.join stupidity.

This commit is contained in:
Jeremy Fincher 2004-08-28 05:47:27 +00:00
parent bb3df205f2
commit c3b32148b3

View File

@ -544,10 +544,11 @@ class Directory(registry.String):
filename = os.path.abspath(filename) filename = os.path.abspath(filename)
selfAbs = os.path.abspath(myself) selfAbs = os.path.abspath(myself)
commonPrefix = os.path.commonprefix([selfAbs, filename]) commonPrefix = os.path.commonprefix([selfAbs, filename])
filename = filename[len(commonPrefix)+1:] # +1 for extra /. filename = filename[len(commonPrefix):]
elif not os.path.isabs(myself): elif not os.path.isabs(myself):
if filename.startswith(myself): if filename.startswith(myself):
filename = filename[len(myself):] filename = filename[len(myself):]
filename = filename.lstrip(os.path.sep) # Stupid os.path.join!
return os.path.join(myself, filename) return os.path.join(myself, filename)
class DataFilename(registry.String): class DataFilename(registry.String):