Changeset 4184

Timestamp:

Oct 21, 2019 12:02:18 PM (4 years ago)

Author:

toby

Message:

fix GPX files with a colour object in them

File:

• trunk/GSASIIIO.py (modified) (2 diffs)

trunk/GSASIIIO.py

@@ -582 +582 @@
     if type(data) is list or type(data) is tuple:
         for i in range(len(data)):
-            objectScan(data[i],tag,indexStack+[i])
+            val = objectScan(data[i],tag,indexStack+[i])
+            if val:
+                data[i] = val
+                print('...fixed')
     elif type(data) is dict:
         for key in data:
-            objectScan(data[key],tag,indexStack+[key])
+            val = objectScan(data[key],tag,indexStack+[key])
+            if val:
+                data[key] = val
+                print('...fixed')
     elif data is None:
-        return
+        return None
     elif type(data) in objectScanIgnore:
-        return
+        return None
     else:
         s = 'unexpected object in '+tag
@@ -598 +604 @@
         global unexpectedObject
         unexpectedObject = True
+        # fix bad objects
+        if "gdi.Colour" in str(type(data)):
+            return tuple(data)
+        return
     
 def cPickleLoad(fp):