Changeset 2547 for trunk/GSASII.py

Timestamp:

Nov 23, 2016 10:15:47 AM (6 years ago)

Author:

vondreele

Message:

remove str() from some text handling - failed on non ascii characters in file name & user entered titles.
Some code cleanups

File:

• trunk/GSASII.py (modified) (4 diffs)

trunk/GSASII.py

@@ -21 +21 @@
 import copy
 import random as ran
-import time
 import glob
 import imp
@@ -79 +78 @@
 import GSASIIpwd as G2pwd
 import GSASIIpwdGUI as G2pdG
-import GSASIIphsGUI as G2phsG
-import GSASIIimgGUI as G2imG
 import GSASIIspc as G2spc
 import GSASIIstrMain as G2stMn
@@ -1532 +1529 @@
                     dlg.Destroy()
             HistName = G2obj.MakeUniqueLabel(HistName,PWDRlist)
-            print('Read powder data '+str(HistName)+ 
-                ' from file '+str(rd.readfilename) +
+            print('Read powder data '+HistName+ 
+                ' from file '+rd.readfilename +
                 ' (format: '+ rd.formatName + 
-                '). Inst parameters from '+str(rd.instmsg))
+                '). Inst parameters from '+rd.instmsg)
             # data are read, now store them in the tree
             Id = self.PatternTree.AppendItem(parent=self.root,text=HistName)
@@ -2461 +2458 @@
             pltNum = self.G2plotNB.nb.GetSelection()
             if pltNum >= 0:                         #to avoid the startup with no plot!
-                pltPage = self.G2plotNB.nb.GetPage(pltNum)
+                self.G2plotNB.nb.GetPage(pltNum)
             item = event.GetItem()
             G2gd.MovePatternTreeToGrid(self,item)