From aa523f8435d209559749bbafeee82ad964726a0f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 13 Jan 2016 02:58:53 +1100 Subject: Fix os.path.is_subdir w/ trailing slash --- release/scripts/modules/bpy/path.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'release') diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py index d7c6101115d..db4c8da30f0 100644 --- a/release/scripts/modules/bpy/path.py +++ b/release/scripts/modules/bpy/path.py @@ -118,13 +118,13 @@ def is_subdir(path, directory): :arg path: An absolute path. :type path: string or bytes """ - from os.path import normpath, normcase + from os.path import normpath, normcase, sep path = normpath(normcase(path)) directory = normpath(normcase(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) + sep = sep.encode('ascii') if isinstance(directory, bytes) else sep + if path.startswith(directory.rstrip(sep) + sep): + return True return False -- cgit v1.2.3