[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [980] contrib/py/scripts/addons/ io_import_scene_lwo.py: improve string reading, ignore non utf-8 chars

Campbell Barton ideasman42 at gmail.com
Fri Sep 3 18:19:14 CEST 2010


Revision: 980
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-extensions&revision=980
Author:   campbellbarton
Date:     2010-09-03 18:19:14 +0200 (Fri, 03 Sep 2010)

Log Message:
-----------
improve string reading, ignore non utf-8 chars

Modified Paths:
--------------
    contrib/py/scripts/addons/io_import_scene_lwo.py

Modified: contrib/py/scripts/addons/io_import_scene_lwo.py
===================================================================
--- contrib/py/scripts/addons/io_import_scene_lwo.py	2010-09-03 16:07:10 UTC (rev 979)
+++ contrib/py/scripts/addons/io_import_scene_lwo.py	2010-09-03 16:19:14 UTC (rev 980)
@@ -264,23 +264,18 @@
 
 def read_lwostring(raw_name):
     '''Parse a zero-padded string.'''
-    i= -1
-    name= ''
-    for i in range(len(raw_name)):
-        if raw_name[i] == 0:
-            break
-        
+
+    i = raw_name.find(b'\0')
     name_len = i + 1
     if name_len % 2 == 1:   # Test for oddness.
         name_len += 1
         
     if i > 0:
         # Some plugins put non-text strings in the tags chunk.
-        try:
-            name= raw_name[0:i].decode()
-        except:
-            name= "BAD_STRING"
-    
+        name = raw_name[0:i].decode("utf-8", "ignore")
+    else:
+        name = ""
+
     return name, name_len
 
     




More information about the Bf-extensions-cvs mailing list