X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=blender25-meshio%2Fpymeshio%2Fmmd.py;h=7dc8f9b673a7fa33e4dab2fb821ed33bbecd80f5;hb=65211f29fc6e1e540cc3e1c515753f860653382b;hp=44ef5241c0f5b6015cd159f11661dae2de86ce3d;hpb=d6a98c93a2201c3b1d9a8481da91274398c1dc84;p=meshio%2Fpymeshio.git

diff --git a/blender25-meshio/pymeshio/mmd.py b/blender25-meshio/pymeshio/mmd.py
index 44ef524..7dc8f9b 100644
--- a/blender25-meshio/pymeshio/mmd.py
+++ b/blender25-meshio/pymeshio/mmd.py
@@ -40,8 +40,8 @@ if sys.version_info[0]<3:
         """
         0x00以降を捨てる
         """
-        pos = src.find(b"\x00")
         assert(type(src)==bytes)
+        pos = src.find(b"\x00")
         if pos >= 0:
             return src[:pos]
         else:
@@ -51,13 +51,41 @@ else:
         """
         0x00以降を捨てる
         """
-        pos = src.find(b"\x00")
         assert(type(src)==bytes)
+        pos = src.find(b"\x00")
         if pos >= 0:
             return src[:pos].decode('cp932')
         else:
             return src.decode('cp932')
 
+
+if sys.version_info[0]<3:
+    def to_str(src):
+        t=type(src)
+        if t==unicode:
+            return src.encode('cp932')
+        elif t==str:
+            return src
+        else:
+            raise "INVALID str: %s" % t
+
+    def from_str(src):
+        return src
+
+else:
+    def to_str(src):
+        t=type(src)
+        if t==str:
+            return src
+        elif t==bytes:
+            return src.decode('cp932')
+        else:
+            raise "INVALID str: %s" % t
+
+    def from_str(src):
+        return src.encode('cp932')
+
+
 def radian_to_degree(x):
     return x/math.pi * 180.0