Changeset 1962


Ignore:
Timestamp:
Aug 26, 2015 10:00:44 AM (6 years ago)
Author:
vondreele
Message:

made PackageVersions? a list so it comes out in same order as the other list
slight reformatting so appearance is the same as well

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1961 r1962  
    36773677        self.SetTopWindow(self.main)
    36783678        # save the current package versions
    3679         self.main.PackageVersions = {}
    3680         self.main.PackageVersions['Python'] = sys.version.split()[0]
     3679        self.main.PackageVersions = []
     3680        self.main.PackageVersions.append(['Python',sys.version.split()[0]])
    36813681        for p in (wx,mpl,np,sp,ogl):
    3682             self.main.PackageVersions[p.__name__] = p.__version__
     3682            self.main.PackageVersions.append([p.__name__,p.__version__])
    36833683        try:
    3684             self.main.PackageVersions[Image.__name__] = Image.VERSION
     3684            self.main.PackageVersions.append([Image.__name__,Image.VERSION])
    36853685        except:
    36863686            try:
    36873687                from PIL import PILLOW_VERSION
    3688                 self.main.PackageVersions[Image.__name__] = PILLOW_VERSION
     3688                self.main.PackageVersions.append([Image.__name__,PILLOW_VERSION])
    36893689            except:
    36903690                pass
    3691         self.main.PackageVersions[' Platform'] = sys.platform+' '+platform.architecture()[0]+' '+platform.machine()
     3691        self.main.PackageVersions.append([' Platform',sys.platform+' '+platform.architecture()[0]+' '+platform.machine()])
     3692       
     3693#        self.main.PackageVersions = {}
     3694#        self.main.PackageVersions['Python'] = sys.version.split()[0]
     3695#        for p in (wx,mpl,np,sp,ogl):
     3696#            self.main.PackageVersions[p.__name__] = p.__version__
     3697#        try:
     3698#            self.main.PackageVersions[Image.__name__] = Image.VERSION
     3699#        except:
     3700#            try:
     3701#                from PIL import PILLOW_VERSION
     3702#                self.main.PackageVersions[Image.__name__] = PILLOW_VERSION
     3703#            except:
     3704#                pass
     3705#        self.main.PackageVersions[' Platform'] = sys.platform+' '+platform.architecture()[0]+' '+platform.machine()
    36923706        # DEBUG: jump to sequential results
    36933707        #Id = G2gd.GetPatternTreeItemId(self.main,self.main.root,'Sequential results')
  • trunk/GSASIIIO.py

    r1961 r1962  
    10051005                if datum[0] == 'Controls' and 'PythonVersions' in datum[1] and GSASIIpath.GetConfigValue('debug'):
    10061006                    print('Packages used to create .GPX file:')
    1007                     for p in sorted(datum[1]['PythonVersions'],key=lambda s: s.lower()):
    1008                         print("{:>14s}: {:s}".format(p,datum[1]['PythonVersions'][p]))
     1007                    if 'dict' in str(type(datum[1]['PythonVersions'])):  #patch
     1008                        for p in sorted(datum[1]['PythonVersions'],key=lambda s: s.lower()):
     1009                            print("{:>14s}: {:s}".format(p[0],p[1]))
     1010                    else:
     1011                        for p in datum[1]['PythonVersions']:
     1012                            print("{:<12s} {:s}".format(p[0]+':',p[1]))
    10091013            for datus in data[1:]:
    10101014                sub = G2frame.PatternTree.AppendItem(Id,datus[0])
Note: See TracChangeset for help on using the changeset viewer.