Changeset 1355

Timestamp:

May 20, 2014 11:49:19 AM (9 years ago)

Author:

toby

Message:

initial 10.9/Canopy fixes

Location:

trunk

Files:

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

trunk/GSASII.py

@@ -3326 +3326 @@
         Should be ignored on other platforms
         '''
+        # PATCH: Canopy 1.4 script main seems dropped on app; ignore .py files
+        if os.path.splitext(filename)[1] == '.py': return
+        # end PATCH
         self.main.OnFileOpen(None,filename)
 

trunk/GSASIIIO.py

@@ -865 +865 @@
 def ProjFileOpen(G2frame):
     'Read a GSAS-II project file and load into the G2 data tree'
+    if not os.path.exists(G2frame.GSASprojectfile):
+        print ('\n*** Error attempt to open project file that does not exist:\n   '+
+               str(G2frame.GSASprojectfile))
+        return
     file = open(G2frame.GSASprojectfile,'rb')
     print 'load from file: ',G2frame.GSASprojectfile

trunk/GSASIIpath.py

@@ -28 +28 @@
         bindir = 'binwin%d.%d' % sys.version_info[0:2]
 elif sys.platform == "darwin":
-    bindir = 'binmac%d.%d' % sys.version_info[0:2]
     import platform
+    if platform.architecture()[0] == '64bit':
+        bindir = 'binmac64-%d.%d' % sys.version_info[0:2]
+    else:
+        bindir = 'binmac%d.%d' % sys.version_info[0:2]
     if platform.mac_ver()[0].startswith('10.5.'):
         bindir += '_10.5'