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/exports/G2export_map.py

    r3000 r3136  
    1818is used by COOT (:class:`ExportMapCCP4`) are implemented.
    1919'''
     20from __future__ import division, print_function
    2021import os
    2122import GSASIIpath
     
    2324GSASIIpath.SetVersionNumber("$Revision$")
    2425import GSASIIIO as G2IO
    25 #import GSASIIstrIO as G2stIO
    26 #import GSASIImath as G2mth
    27 #import GSASIIlattice as G2lat
    28 #import GSASIIspc as G2spc
    29 #import GSASIIphsGUI as G2pg
    30 #import GSASIIstrMain as G2stMn
    3126
    3227class ExportMapASCII(G2IO.ExportBaseclass):
     
    5853            rho = phasedict['General']['Map'].get('rho',[])
    5954            if not len(rho):
    60                 print "There is no map for phase "+phasenam
     55                print ("There is no map for phase "+phasenam)
    6156                continue
    6257            if len(self.phasenam) > 1: # if more than one filename is written, add a phase # -- not in use yet
     
    117112           
    118113            if not len(rho):
    119                 print "There is no map for phase "+phasenam
     114                print ("There is no map for phase "+phasenam)
    120115                continue
    121116            if len(self.phasenam) > 1: # if more than one filename is written, add a phase # -- not in use yet
Note: See TracChangeset for help on using the changeset viewer.