Changeset 3136 for trunk/GSASIIfiles.py


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIfiles.py

    r3012 r3136  
    2121at that point.
    2222'''
    23 
     23from __future__ import division, print_function
    2424import os
    2525import sys
     
    2727import imp
    2828import inspect
    29 import traceback
    3029import platform
     30import numpy as np
    3131
    3232import GSASIIpath
     
    355355                            readerlist.append(reader)
    356356        except AttributeError:
    357             print 'Import_' + errprefix + ': Attribute Error ' + filename
     357            print ('Import_' + errprefix + ': Attribute Error ' + filename)
    358358            if traceback:
    359359                traceback.print_exc(file=sys.stdout)
    360360        except Exception as exc:
    361             print '\nImport_' + errprefix + ': Error importing file ' + filename
    362             print u'Error message: {}\n'.format(exc)
     361            print ('\nImport_' + errprefix + ': Error importing file ' + filename)
     362            print (u'Error message: {}\n'.format(exc))
    363363            if traceback:
    364364                traceback.print_exc(file=sys.stdout)
Note: See TracChangeset for help on using the changeset viewer.