Changeset 3458

Timestamp:

Jun 28, 2018 4:50:46 PM (7 years ago)

Author:

toby

Message:

Complete basestring fix

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (2 diffs)
• GSASIIexprGUI.py (modified) (1 diff)
• GSASIIobj.py (modified) (2 diffs)

trunk/GSASIIctrlGUI.py ¶

@@ -3389 +3389 @@
         # make lists of variables of different types along with lists of parameter names, histogram #s, phase #s,...
         self.parmNames = sorted(list(parmDict.keys()))
-        basestr = basestring
+        if '2' in platform.python_version_tuple()[0]: 
+            basestr = basestring
+        else:
+            basestr = str
         splitNames = [item.split(':') for item in self.parmNames if len(item) > 3 and not isinstance(self.parmDict[item],basestr)]
         globNames = [':'.join(item) for item in splitNames if not item[0] and not item[1]]
@@ -3428 +3431 @@
         count = 0
         for name in self.choiceDict[self.parmChoice]:
-            basestr = basestring
+            if '2' in platform.python_version_tuple()[0]: 
+                basestr = basestring
+            else:
+                basestr = str
             if isinstance(self.parmDict[name],basestr): continue
             if 'Refined' in self.listSel and (name not in self.fullVaryList

trunk/GSASIIexprGUI.py ¶

@@ -185 +185 @@
                 val = parmDict[key]
             if '2' in platform.python_version_tuple()[0]: 
-                string = basestring
+                basestr = basestring
             else:
-                string = str
-            if isinstance(val, string): continue
+                basestr = str
+            if isinstance(val, basestr): continue
             try:
                 self.parmDict[key] = float(val)

trunk/GSASIIobj.py ¶

@@ -2562 +2562 @@
         '''
         # Patch: for old-style expressions with a (now removed step size)
-        if '2' not in platform.python_version_tuple()[0]: basestring = str
+        if '2' in platform.python_version_tuple()[0]: 
+            basestr = basestring
+        else:
+            basestr = str
         for v in self.eObj.assgnVars:
-            if not isinstance(self.eObj.assgnVars[v], basestring):
+            if not isinstance(self.eObj.assgnVars[v], basestr):
                 self.eObj.assgnVars[v] = self.eObj.assgnVars[v][0]
         self.parmDict = {}
@@ -2582 +2585 @@
         # look at first value in parmDict to determine its type
         parmsInList = True
-        if '2' not in platform.python_version_tuple()[0]: basestring = str
+        if '2' in platform.python_version_tuple()[0]: 
+            basestr = basestring
+        else:
+            basestr = str
         for key in parmDict:
             val = parmDict[key]
-            if isinstance(val, basestring):
+            if isinstance(val, basestr):
                 parmsInList = False
                 break