archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T44137: bpy.path.is_subdir fails

Browse Source 
`bpy.path.is_subdir("/abc/def/ghi","/abc/de")` incorrectly returned True
This commit is contained in:
Campbell Barton
2015-03-26 16:29:14 +11:00
parent 770b109deb
commit b87eaef1f7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/modules/bpy/path.py
View File

@@ -116,7 +116,11 @@ def is_subdir(path, directory):
from os.path import normpath, normcase from os.path import normpath, normcase
path = normpath(normcase(path)) path = normpath(normcase(path))
directory = normpath(normcase(directory)) directory = normpath(normcase(directory))
return path.startswith(directory) if len(path) > len(directory):
if path.startswith(directory):
sep = ord(_os.sep) if isinstance(directory, bytes) else _os.sep
return (path[len(directory)] == sep)
return False
def clean_name(name, replace="_"): def clean_name(name, replace="_"):