Changeset 2819 for trunk/exports/G2export_csv.py

Timestamp:

May 4, 2017 9:14:19 AM (6 years ago)

Author:

vondreele

Message:

fix printing of nonascii characters (e.g. "umlaut-o") in file names, etc. in exporters

File:

• trunk/exports/G2export_csv.py (modified) (7 diffs)

trunk/exports/G2export_csv.py

@@ -97 +97 @@
 
         if mode == 'w':
-            print('Phase '+str(phasenam)+' written to file '+str(self.fullpath))
+            print('Phase '+phasenam+' written to file '+self.fullpath)
         self.CloseFile()
     
@@ -154 +154 @@
                         line += ","
                 self.Write(line)
-            print('Phase '+str(phasenam)+' written to file '+str(self.fullpath))
+            print('Phase '+phasenam+' written to file '+self.fullpath)
         self.CloseFile()
 
@@ -210 +210 @@
             self.filename = os.path.join(self.dirname,fileroot + self.extension)
             self.Writer(hist)
-            print('Histogram '+str(hist)+' written to file '+str(self.fullpath))
+            print('Histogram '+hist+' written to file '+self.fullpath)
 
 class ExportMultiPowderCSV(G2IO.ExportBaseclass):
@@ -253 +253 @@
             digitList += [(13,3),]
             csvData.append(histblk['Data'][1])
-            print('Histogram '+str(hist)+' written to file '+str(self.fullpath))
+            print('Histogram '+hist+' written to file '+self.fullpath)
         self.OpenFile()
         WriteList(self,headList)
@@ -338 +338 @@
                         self.Write(fmt.format(h,k,l,pos,Fobs,Fcalc,phase,mult,s,g,FWHM,Prfo,i))
         self.CloseFile()
-        print(str(hist)+'reflections written to file '+str(self.fullpath))
+        print(hist+'reflections written to file '+self.fullpath)
 
 class ExportSingleCSV(G2IO.ExportBaseclass):
@@ -384 +384 @@
                     self.Write(fmt.format(h,k,l,pos,Fobs,Fcalc,phase,mult,i))
         self.CloseFile()
-        print(str(hist)+' written to file '+str(self.fullname))                        
+        print(hist+' written to file '+self.fullname)                        
 
 class ExportStrainCSV(G2IO.ExportBaseclass):
@@ -427 +427 @@
                 self.Write(fmt2.format(dat[1],dat[0],dat[2]))            
         self.CloseFile()
-        print(str(hist)+' written to file '+str(self.fullpath))
+        print(hist+' written to file '+self.fullpath)