Changeset 3167
- Timestamp:
- Nov 29, 2017 10:42:44 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIctrlGUI.py
r3161 r3167 3677 3677 "Display an 'About GSAS-II' box" 3678 3678 import GSASII 3679 info = wx.AboutDialogInfo() 3679 try: 3680 import wx.adv as wxadv # AboutBox moved here in Phoenix 3681 except: 3682 wxadv = wx 3683 info = wxadv.AboutDialogInfo() 3680 3684 info.Name = 'GSAS-II' 3681 3685 ver = GSASIIpath.svnGetRev() 3682 if ver: 3683 info.Version = 'Revision '+str(ver)+' (svn), version '+GSASII.__version__ 3684 else: 3685 info.Version = 'Revision '+str(GSASIIpath.GetVersionNumber())+' (.py files), version '+GSASII.__version__ 3686 if not ver: 3687 ver = GSASIIpath.GetVersionNumber() 3688 info.SetVersion(ver) 3686 3689 #info.Developers = ['Robert B. Von Dreele','Brian H. Toby'] 3687 3690 info.Copyright = ('(c) ' + time.strftime('%Y') + … … 3702 3705 ''' 3703 3706 info.WebSite = ("https://subversion.xray.aps.anl.gov/trac/pyGSAS","GSAS-II home page") 3704 wx .AboutBox(info)3707 wxadv.AboutBox(info) 3705 3708 3706 3709 def OnCheckUpdates(self,event): -
trunk/GSASIIpath.py
r3154 r3167 169 169 # add likely places to find subversion when installed with GSAS-II 170 170 pathlist = os.environ["PATH"].split(os.pathsep) 171 pathlist. append(os.path.split(sys.executable)[0])172 pathlist. append(path2GSAS2)171 pathlist.insert(0,os.path.split(sys.executable)[0]) 172 pathlist.insert(1,path2GSAS2) 173 173 for rpt in ('..','bin'),('..','Library','bin'),('svn','bin'),('svn',),('.'): 174 174 pt = os.path.normpath(os.path.join(path2GSAS2,*rpt)) … … 207 207 print ('err=%s'%err) 208 208 return None 209 return out.strip() 209 return out.strip().decode() 210 210 211 211 def svnVersionNumber(svn=None): … … 525 525 res,err = p.communicate() 526 526 versions = {} 527 for d in res. split():527 for d in res.decode().split(): 528 528 if d.startswith(bindir): 529 529 v = intver(d.rstrip('/').split('_')[3].lstrip('n'))
Note: See TracChangeset
for help on using the changeset viewer.