Changeset 1962

Timestamp:

Aug 26, 2015 10:00:44 AM (7 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:

• GSASII.py (modified) (1 diff)
• GSASIIIO.py (modified) (1 diff)

trunk/GSASII.py

@@ -3677 +3677 @@
         self.SetTopWindow(self.main)
         # save the current package versions
-        self.main.PackageVersions = {}
-        self.main.PackageVersions['Python'] = sys.version.split()[0]
+        self.main.PackageVersions = []
+        self.main.PackageVersions.append(['Python',sys.version.split()[0]])
         for p in (wx,mpl,np,sp,ogl):
-            self.main.PackageVersions[p.__name__] = p.__version__
+            self.main.PackageVersions.append([p.__name__,p.__version__])
         try:
-            self.main.PackageVersions[Image.__name__] = Image.VERSION
+            self.main.PackageVersions.append([Image.__name__,Image.VERSION])
         except:
             try:
                 from PIL import PILLOW_VERSION
-                self.main.PackageVersions[Image.__name__] = PILLOW_VERSION
+                self.main.PackageVersions.append([Image.__name__,PILLOW_VERSION])
             except:
                 pass
-        self.main.PackageVersions[' Platform'] = sys.platform+' '+platform.architecture()[0]+' '+platform.machine()
+        self.main.PackageVersions.append([' Platform',sys.platform+' '+platform.architecture()[0]+' '+platform.machine()])
+        
+#        self.main.PackageVersions = {}
+#        self.main.PackageVersions['Python'] = sys.version.split()[0]
+#        for p in (wx,mpl,np,sp,ogl):
+#            self.main.PackageVersions[p.__name__] = p.__version__
+#        try:
+#            self.main.PackageVersions[Image.__name__] = Image.VERSION
+#        except:
+#            try:
+#                from PIL import PILLOW_VERSION
+#                self.main.PackageVersions[Image.__name__] = PILLOW_VERSION
+#            except:
+#                pass
+#        self.main.PackageVersions[' Platform'] = sys.platform+' '+platform.architecture()[0]+' '+platform.machine()
         # DEBUG: jump to sequential results
         #Id = G2gd.GetPatternTreeItemId(self.main,self.main.root,'Sequential results')

trunk/GSASIIIO.py

@@ -1005 +1005 @@
                 if datum[0] == 'Controls' and 'PythonVersions' in datum[1] and GSASIIpath.GetConfigValue('debug'):
                     print('Packages used to create .GPX file:')
-                    for p in sorted(datum[1]['PythonVersions'],key=lambda s: s.lower()):
-                        print("{:>14s}: {:s}".format(p,datum[1]['PythonVersions'][p]))
+                    if 'dict' in str(type(datum[1]['PythonVersions'])):  #patch
+                        for p in sorted(datum[1]['PythonVersions'],key=lambda s: s.lower()):
+                            print("{:>14s}: {:s}".format(p[0],p[1]))
+                    else:
+                        for p in datum[1]['PythonVersions']:
+                            print("{:<12s} {:s}".format(p[0]+':',p[1]))
             for datus in data[1:]:
                 sub = G2frame.PatternTree.AppendItem(Id,datus[0])