Changeset 1087

Timestamp:

Mar 16, 2005, 2:10:38 PM (20 years ago)

Author:

ole

Message:

Fixed potential bug with os.uname() being called on win32 platforms.

Location:

inundation/ga/storm_surge/pyvolution

Files:

• compile.py (modified) (1 diff)
• domain.py (modified) (1 diff)
• shallow_water.py (modified) (1 diff)
• test_all.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/compile.py

@@ -198 +198 @@
     if os.name == 'posix' and os.uname()[4] == 'x86_64':
       #Extra flags for 64 bit architectures
+      #Second clause will always fail on Win32 because uname is UNIX specific
+      #but won't get past first clause
 
       #FIXME: Which one?

inundation/ga/storm_surge/pyvolution/domain.py

@@ -626 +626 @@
     except:
         import os
-        if os.uname()[4] == 'x86_64':
+        if os.name == 'posix' and os.uname()[4] == 'x86_64':        
             pass
             #Psyco isn't supported on 64 bit systems, but it doesn't matter

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -1624 +1624 @@
     except:
         import os
-        if os.uname()[4] == 'x86_64':
+        if os.name == 'posix' and os.uname()[4] == 'x86_64':
             pass
             #Psyco isn't supported on 64 bit systems, but it doesn't matter

inundation/ga/storm_surge/pyvolution/test_all.py

@@ -75 +75 @@
 if __name__ == '__main__':
 
-    os.system('python compile.py') #Attempt to compile all extensions
+    execfile('compile.py')
+    #os.system('python compile.py') #Attempt to compile all extensions
 
     #print regressionTest()