Changeset 3136 for trunk/imports/G2pwd_Panalytical.py

Timestamp:

Oct 23, 2017 11:39:16 AM (5 years ago)

Author:

vondreele

Message:

make GSAS-II python 3.6 compliant & preserve python 2.7 use;changes:
do from future import division, print_function for all GSAS-II py sources
all menu items revised to be py 2.7/3.6 compliant
all wx.OPEN --> wx.FD_OPEN in file dialogs
all integer divides (typically for image pixel math) made explicit with ; ambiguous ones made floats as appropriate
all print "stuff" --> print (stuff)
all print >> pFile,'stuff' --> pFile.writeCIFtemplate('stuff')
all read file opens made explicit 'r' or 'rb'
all cPickle imports made for py2.7 or 3.6 as cPickle or _pickle; test for '2' platform.version_tuple[0] for py 2.7
define cPickleload to select load(fp) or load(fp,encoding='latin-1') for loading gpx files; provides cross compatibility between py 2.7/3.6 gpx files
make dict.keys() as explicit list(dict.keys()) as needed (NB: possible source of remaining py3.6 bugs)
make zip(a,b) as explicit list(zip(a,b)) as needed (NB: possible source of remaining py3.6 bugs)
select unichr/chr according test for '2' platform.version_tuple[0] for py 2.7 (G2pwdGUI * G2plot) for special characters
select wg.EVT_GRID_CELL_CHANGE (classic) or wg.EVT_GRID_CELL_CHANGED (phoenix) in grid Bind
maxint --> maxsize; used in random number stuff
raise Exception,"stuff" --> raise Exception("stuff")
wx 'classic' sizer.DeleteWindows?() or 'phoenix' sizer.Clear(True)
wx 'classic' SetToolTipString?(text) or 'phoenix' SetToolTip?(wx.ToolTip?(text)); define SetToolTipString?(self,text) to handle the choice in plots
status.SetFields? --> status.SetStatusText?
'classic' AddSimpleTool? or 'phoenix' self.AddTool? for plot toolbar; Bind different as well
define GetItemPydata? as it doesn't exist in wx 'phoenix'
allow python versions 2.7 & 3.6 to run GSAS-II
Bind override commented out - no logging capability (NB: remove all logging code?)
all import ContentsValidator? open filename & test if valid then close; filepointer removed from Reader
binary importers (mostly images) test for 'byte' type & convert as needed to satisfy py 3.6 str/byte rules

File:

• trunk/imports/G2pwd_Panalytical.py (modified) (2 diffs)

trunk/imports/G2pwd_Panalytical.py

@@ -8 +8 @@
 ########### SVN repository information ###################
 
+from __future__ import division, print_function
 import os.path as ospath
 import xml.etree.ElementTree as ET
@@ -33 +34 @@
     # Validate the contents -- make sure we only have valid lines and set
     # values we will need for later read.
-    def ContentsValidator(self, filepointer):
+    def ContentsValidator(self, filename):
+        fp = open(filename,'r')
         self.vals = None
         self.stepsize = None
-        filepointer.seek(0)
+        fp.seek(0)
         try:
-            self.root = ET.parse(filepointer).getroot()
+            self.root = ET.parse(fp).getroot()
             tag = self.root.tag
             tag = tag.split('}')[0]+'}'
             self.root.find(tag+'comment')
-           
         except:
             self.errors = 'Bad xml file'
+            fp.close()
             return False
+        fp.close()
         return True
             
-    def Reader(self,filename,filepointer, ParentFrame=None, **kwarg):
+    def Reader(self,filename, ParentFrame=None, **kwarg):
         'Read a Panalytical .xrdml (.xml) file; already in self.root'
         blockNum = kwarg.get('blocknum',0)