Changeset e615a0d in sasview

Timestamp:

Dec 22, 2011 5:21:24 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1eae432

Parents:

30ad350

Message:

defined is_64bit before being used

File:

• setup.py (modified) (3 diffs)

setup.py

@@ -7 +7 @@
 
 import sys
+
 import os
 import platform
@@ -48 +49 @@
 if os.path.isdir(sans_dir):
     f_path = os.path.join(sans_dir, "sansview.log")
-    if sys.platform =='darwin' or sys.platform == 'win32':
-        if os.path.isfile(f_path):
-            os.remove(f_path)
-        f_path = os.path.join(sans_dir, 'config', "custom_config.py")
-        if os.path.isfile(f_path):
-            os.remove(f_path)
-        f_path = os.path.join(sans_dir, 'plugin_models')
-        if os.path.isdir(f_path):
-            for file in os.listdir(f_path): 
-                if file in plugin_model_list:
-                    file_path =  os.path.join(f_path, file)
-                    os.remove(file_path)
-
-
+    if os.path.isfile(f_path):
+        os.remove(f_path)
+    f_path = os.path.join(sans_dir, 'config', "custom_config.py")
+    if os.path.isfile(f_path):
+        os.remove(f_path)
+    f_path = os.path.join(sans_dir, 'plugin_models')
+    if os.path.isdir(f_path):
+        for file in os.listdir(f_path): 
+            if file in plugin_model_list:
+                file_path =  os.path.join(f_path, file)
+                os.remove(file_path)
+                    
+# 'sys.maxsize' and 64bit: Not supported for python2.5
+is_64bits = False
+if sys.version_info >= (2, 6):
+    is_64bits = sys.maxsize > 2**32
+    
+    
 enable_openmp = True                    
 if sys.argv[-1] == "-nomp":
@@ -81 +86 @@
     def build_extensions(self):
         # Get 64-bitness
-        if sys.version_info >= (2, 6):
-            is_64bits = sys.maxsize > 2**32
-        else:
-            # 'sys.maxsize' and 64bit: Not supported for python2.5
-            is_64bits = False
-        
         c = self.compiler.compiler_type
         print "Compiling with %s (64bit=%s)" % (c, str(is_64bits))