Revision: 44915
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44915
Author: campbellbarton
Date: 2012-03-16 04:14:57 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
py api:
modify bpy.path.display_name_from_filepath() to accept bytes
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy/path.py
Modified: trunk/blender/release/scripts/modules/bpy/path.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/path.py 2012-03-16 04:11:35 UTC
(rev 44914)
+++ trunk/blender/release/scripts/modules/bpy/path.py 2012-03-16 04:14:57 UTC
(rev 44915)
@@ -145,7 +145,10 @@
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):
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
