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

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

1 edited


  • trunk/fsource/pack_f.for

    r2445 r3136  
    1616      INTEGER*2 TMP
    17       CHARACTER*1 CMPR(0:N-1)
     17      LOGICAL*1 CMPR(0:N-1)
    1818      DATA BITDECODE /0,4,5,6,7,8,16,32/
    1919      DATA SETBITS /Z'0000',Z'0001',Z'0003',Z'0007',
    4040            SPILLBITS = 0
    4141          ELSE
    42             SPILL = ICHAR(CMPR(IN))
     42            SPILL = CMPR(IN)
     43C            SPILL = ICHAR(CMPR(IN))
    4344            IN = IN+1
    4445            SPILLBITS = 8
    6465                END IF
    6566              ELSE
    66                 SPILL = ICHAR(CMPR(IN))
     67                SPILL = CMPR(IN)
     68C                SPILL = ICHAR(CMPR(IN))
    6769                IN = IN+1
    6870                SPILLBITS = 8
Note: See TracChangeset for help on using the changeset viewer.