Changeset 1523

Timestamp:

Oct 7, 2014 12:43:33 PM (9 years ago)

Author:

toby

Message:

change isinstance in patch code

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (3 diffs)
• GSASIIstrIO.py (modified) (1 diff)

trunk/GSASIIgrid.py

@@ -5332 +5332 @@
     if 'wtFactor' not in data[0]:
         data[0] = {'wtFactor':1.0}
-    if isinstance(data[1],list) and kind == 'HKLF':
+    #if isinstance(data[1],list) and kind == 'HKLF':
+    if 'list' in str(type(data[1])) and kind == 'HKLF':
         RefData = {'RefList':[],'FF':[]}
         for ref in data[1]:
@@ -5632 +5633 @@
         data = G2frame.PatternTree.GetItemPyData(item)
 #patch
-        if isinstance(data,list):
+        if 'list' in str(type(data)):
             data = {'peaks':data,'sigDict':{}}
             G2frame.PatternTree.SetItemPyData(item,data)

trunk/GSASIIphsGUI.py

@@ -5282 +5282 @@
             reflSets = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))
             reflData = reflSets[phaseName]
-            if isinstance(reflData,list):       #patch for old reflection data
+            if 'list' in str(type(reflData)):       #patch for old reflection data
+            #if isinstance(reflData,list):       #patch for old reflection data
                 RefData = {'RefList':[],'FF':[]}
                 for ref in reflData:
@@ -5377 +5378 @@
             reflSets = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))
             reflDict = reflSets[phaseName]
-            if isinstance(reflDict,list):       #patch for old reflection data
+            if 'list' in str(type(reflDict)):       #patch for old reflection data
+            #if isinstance(reflDict,list):       #patch for old reflection data
                 RefData = {'RefList':[],'FF':[]}
                 for ref in reflDict:
@@ -5582 +5584 @@
     if 'MCSA' not in data:
         data['MCSA'] = {'Models':[{'Type':'MD','Coef':[1.0,False,[.8,1.2],],'axis':[0,0,1]}],'Results':[],'AtInfo':{}}
-    if isinstance(data['MCSA']['Results'],dict):
+    #if isinstance(data['MCSA']['Results'],dict):
+    if 'dict' in str(type(data['MCSA']['Results'])):
         data['MCSA']['Results'] = []
 #end patch    

trunk/GSASIIstrIO.py

@@ -327 +327 @@
                 HKLFdata.update(datum[1][0])        #weight factor
 #patch
-                if isinstance(datum[1][1],list):
+                if 'list' in str(type(datum[1][1])):
+                #if isinstance(datum[1][1],list):
                     RefData = {'RefList':[],'FF':{}}
                     for ref in datum[1][1]: