Changeset 3458 for trunk/GSASIIobj.py

Timestamp:

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

Author:

toby

Message:

Complete basestring fix

File:

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

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