Changeset 3260

Timestamp:

Feb 4, 2018 9:38:11 AM (5 years ago)

Author:

toby

Message:

misc Py3 fixes

Location:

trunk

Files:

• GSASIIIO.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)
• exports/G2export_CIF.py (modified) (4 diffs)

trunk/GSASIIIO.py

@@ -1858 +1858 @@
             if key[2].startswith('dA'):
                 self.parmDict[i] = 0.0
-        for i,(val,sig) in data_name.get('depParmDict',{}).iteritems():
+        for i,(val,sig) in data_name.get('depParmDict',{}).items():
             self.parmDict[i] = val
             self.sigDict[i] = sig
@@ -1913 +1913 @@
         Dlookup = {}
         varied = [striphist(i) for i in data_name['varyList']]
-        for item,val in data_name['newCellDict'].iteritems():
+        for item,val in data_name['newCellDict'].items():
             if item in varied:
                 ESDlookup[val[0]] = item

trunk/GSASIIpwdGUI.py

@@ -761 +761 @@
             dlg.Destroy()
         for r in rows:
-            for lbl,c in refOpts.iteritems():
+            for lbl,c in refOpts.items():
                 data['peaks'][r][c] = lbl in sels
         UpdatePeakGrid(G2frame,data)

trunk/exports/G2export_CIF.py

@@ -53 +53 @@
 except ImportError:
     pass
+import GSASIIobj as G2obj
 import GSASIImath as G2mth
 import GSASIIspc as G2spc
@@ -324 +325 @@
     WriteCIFitem(fp, '\nloop_  _atom_type_symbol _atom_type_number_in_cell')
     formula = ''
-    for elem in HillSortElements(compDict.keys()):
+    for elem in HillSortElements(list(compDict.keys())):
         WriteCIFitem(fp, '  ' + PutInCol(elem,4) +
                      G2mth.ValEsd(compDict[elem],-0.009,True))
@@ -441 +442 @@
             CIFobj = G2dict.get("CIF_template")
             if defaultname:
-                defaultname = defaultname.encode('ascii','replace').strip().replace(' ','_')
+                defaultname = G2obj.StripUnicode(defaultname)
                 defaultname = re.sub(r'[^a-zA-Z0-9_-]','',defaultname)
                 defaultname = tmplate + "_" + defaultname + ".cif"
@@ -2945 +2946 @@
         self.CIF = G2dict.get("CIF_template")
         if defaultname:
-            self.defaultname = defaultname.encode('ascii','replace').strip().replace(' ','_')
+            self.defaultname = G2obj.StripUnicode(defaultname)
             self.defaultname = re.sub(r'[^a-zA-Z0-9_-]','',self.defaultname)
             self.defaultname = tmplate + "_" + self.defaultname + ".cif"