Changeset 3167

Timestamp:

Nov 29, 2017 10:42:44 PM (4 years ago)

Author:

toby

Message:

Misc Py3 fixes

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (2 diffs)
• GSASIIpath.py (modified) (3 diffs)

trunk/GSASIIctrlGUI.py

@@ -3677 +3677 @@
         "Display an 'About GSAS-II' box"
         import GSASII
-        info = wx.AboutDialogInfo()
+        try:
+            import wx.adv as wxadv  # AboutBox moved here in Phoenix
+        except:
+            wxadv = wx
+        info = wxadv.AboutDialogInfo()
         info.Name = 'GSAS-II'
         ver = GSASIIpath.svnGetRev()
-        if ver: 
-            info.Version = 'Revision '+str(ver)+' (svn), version '+GSASII.__version__
-        else:
-            info.Version = 'Revision '+str(GSASIIpath.GetVersionNumber())+' (.py files), version '+GSASII.__version__
+        if not ver:
+            ver = GSASIIpath.GetVersionNumber()
+        info.SetVersion(ver)
         #info.Developers = ['Robert B. Von Dreele','Brian H. Toby']
         info.Copyright = ('(c) ' + time.strftime('%Y') +
@@ -3702 +3705 @@
 '''
         info.WebSite = ("https://subversion.xray.aps.anl.gov/trac/pyGSAS","GSAS-II home page")
-        wx.AboutBox(info)
+        wxadv.AboutBox(info)
 
     def OnCheckUpdates(self,event):

trunk/GSASIIpath.py

@@ -169 +169 @@
     # add likely places to find subversion when installed with GSAS-II
     pathlist = os.environ["PATH"].split(os.pathsep)
-    pathlist.append(os.path.split(sys.executable)[0])
-    pathlist.append(path2GSAS2)
+    pathlist.insert(0,os.path.split(sys.executable)[0])
+    pathlist.insert(1,path2GSAS2)
     for rpt in ('..','bin'),('..','Library','bin'),('svn','bin'),('svn',),('.'):
         pt = os.path.normpath(os.path.join(path2GSAS2,*rpt))
@@ -207 +207 @@
         print ('err=%s'%err)
         return None
-    return out.strip()
+    return out.strip().decode()
 
 def svnVersionNumber(svn=None):
@@ -525 +525 @@
     res,err = p.communicate()
     versions = {}
-    for d in res.split():
+    for d in res.decode().split():
         if d.startswith(bindir):
             v = intver(d.rstrip('/').split('_')[3].lstrip('n'))