Changeset 2819 for trunk/exports/G2export_pwdr.py

Timestamp:

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

Author:

vondreele

Message:

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

File:

• trunk/exports/G2export_pwdr.py (modified) (3 diffs)

trunk/exports/G2export_pwdr.py

@@ -59 +59 @@
         self.Write(('INS  1PRCF12%15.6e%15.6e%15.6e%15.6e   ')%(Inst['X'][1],Inst['Y'][1],Inst['SH/L'][1]/2.,Inst['SH/L'][1]/2.))
         self.CloseFile()
-        print('Parameters from '+str(hist)+' written to file '+str(prmname))
+        print('Parameters from '+hist+' written to file '+prmname)
         return prmname
 
@@ -104 +104 @@
             prmname = self.WriteInstFile(hist,histblk['Instrument Parameters'][0])
             self.Writer(hist,prmname=prmname)
-            print('Histogram '+str(hist)+' written to file '+str(self.fullpath))
+            print('Histogram '+hist+' written to file '+self.fullpath)
 
 class ExportPowderXYE(G2IO.ExportBaseclass):
@@ -156 +156 @@
             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)