From c6c0601d8ea410494b59081152f3cc080a8f39a3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 16 Mar 2012 04:14:57 +0000 Subject: py api: modify bpy.path.display_name_from_filepath() to accept bytes --- release/scripts/modules/bpy/path.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'release/scripts/modules/bpy') diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py index 98a3c81d65a..9a90797bf28 100644 --- a/release/scripts/modules/bpy/path.py +++ b/release/scripts/modules/bpy/path.py @@ -145,7 +145,10 @@ def display_name_from_filepath(name): ensured to be utf8 compatible. """ name = _os.path.splitext(basename(name))[0] - return name.encode("utf8", "replace").decode("utf8") + if type(name) == bytes: + return name.decode("utf8", "replace") + else: + return name.encode("utf8", "replace").decode("utf8") def resolve_ncase(path): -- cgit v1.2.3