Changeset 3136 for trunk/GSASIIscriptable.py

Timestamp:

Oct 23, 2017 11:39:16 AM (4 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/GSASIIscriptable.py (modified) (9 diffs)

trunk/GSASIIscriptable.py

@@ -459 +459 @@
         print(u'**** ERROR: '+reader+u' is not a scriptable reader')
         return None
-    fl = open(filename,'rb')
     rdlist = []
-    if rd.ContentsValidator(fl):
-        fl.seek(0)
+    if rd.ContentsValidator(filename):
         repeat = True
         rdbuffer = {} # create temporary storage for file reader
@@ -470 +468 @@
             repeat = False
             rd.objname = ospath.basename(filename)
-            flag = rd.Reader(filename,fl,None,buffer=rdbuffer,blocknum=block,)
+            flag = rd.Reader(filename,None,buffer=rdbuffer,blocknum=block,)
             if flag:
                 rdlist.append(copy.deepcopy(rd)) # save the result before it is written over
@@ -617 +615 @@
             if atom[ct] in generalData['Isotope']:
                 if generalData['Isotope'][atom[ct]] not in generalData['Isotopes'][atom[ct]]:
-                    isotope = generalData['Isotopes'][atom[ct]].keys()[-1]
+                    isotope = list(generalData['Isotopes'][atom[ct]].keys())[-1]
                     generalData['Isotope'][atom[ct]] = isotope
                 generalData['AtomMass'].append(Info['Isotopes'][generalData['Isotope'][atom[ct]]]['Mass'])
@@ -623 +621 @@
                 generalData['Isotope'][atom[ct]] = 'Nat. Abund.'
                 if 'Nat. Abund.' not in generalData['Isotopes'][atom[ct]]:
-                    isotope = generalData['Isotopes'][atom[ct]].keys()[-1]
+                    isotope = list(generalData['Isotopes'][atom[ct]].keys())[-1]
                     generalData['Isotope'][atom[ct]] = isotope
                 generalData['AtomMass'].append(Info['Mass'])
@@ -725 +723 @@
             rd.ReInitialize()
             # Rewind file
-            fp.seek(0)
             rd.errors = ""
-            if not rd.ContentsValidator(fp):
+            if not rd.ContentsValidator(filename):
                 # Report error
                 pass
@@ -737 +734 @@
             block = 0
             rdbuffer = {}
-            fp.seek(0)
             repeat = True
             while repeat:
@@ -744 +740 @@
                 rd.objname = os.path.basename(filename)
                 try:
-                    flag = rd.Reader(filename, fp, buffer=rdbuffer, blocknum=block)
+                    flag = rd.Reader(filename,buffer=rdbuffer, blocknum=block)
                 except:
                     flag = False
@@ -823 +819 @@
     valuesdict = {'wtFactor': 1.0,
                   'Dummy': False,
-                  'ranId': ran.randint(0, sys.maxint),
+                  'ranId': ran.randint(0, sys.maxsize),
                   'Offset': [0.0, 0.0], 'delOffset': 0.02*Ymax,
                   'refOffset': -0.1*Ymax, 'refDelt': 0.1*Ymax,
@@ -897 +893 @@
     elif isinstance(from_, list) and isinstance(into, list):
         if len(from_) == len(into):
-            for i in xrange(len(from_)):
+            for i in range(len(from_)):
                 both_dicts = (isinstance(from_[i], dict)
                               and isinstance(into[i], dict))